#!/usr/bin/perl
-#script to recieve orders
+#script to receive orders
# Copyright 2000-2002 Katipo Communications
#
# 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 <http://www.gnu.org/licenses>.
=head1 NAME
=head1 DESCRIPTION
This script shows all orders receipt or pending for a given supplier.
-It allows to write an order as 'received' when he arrives.
+It allows to write an order as 'received' when it arrives.
=head1 CGI PARAMETERS
=cut
-use strict;
-use warnings;
+use Modern::Perl;
use C4::Auth;
use C4::Acquisition;
use C4::Budgets;
-use C4::Bookseller qw/ GetBookSellerFromId /;
use C4::Biblio;
use C4::Items;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Output;
-use C4::Dates qw/format_date format_date_in_iso/;
use C4::Suggestions;
-use C4::Reserves qw/GetReservesFromBiblionumber/;
-use JSON;
-
-my $input=new CGI;
-sub get_value_with_gst_params {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- if ( $bookseller->{listincgst} ) {
- if ( $bookseller->{invoiceincgst} ) {
- return $value;
- } else {
- return $value / ( 1 + $gstrate );
- }
- } else {
- if ( $bookseller->{invoiceincgst} ) {
- return $value * ( 1 + $gstrate );
- } else {
- return $value;
- }
- }
-}
+use Koha::Acquisition::Baskets;
+use Koha::Acquisition::Bookseller;
+use Koha::Acquisition::Orders;
+use Koha::Biblios;
+use Koha::DateUtils;
+use Koha::Biblios;
-sub get_gste {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- return $bookseller->{invoiceincgst}
- ? $value / ( 1 + $gstrate )
- : $value;
-}
+use JSON;
-sub get_gst {
- my $value = shift;
- my $gstrate = shift;
- my $bookseller = shift;
- return $bookseller->{invoiceincgst}
- ? $value / ( 1 + $gstrate ) * $gstrate
- : $value * ( 1 + $gstrate ) - $value;
-}
+my $input=new CGI;
+my $sticky_filters = $input->param('sticky_filters') || 0;
my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "acqui/parcel.tmpl",
+ = get_template_and_user({template_name => "acqui/parcel.tt",
query => $input,
type => "intranet",
authnotrequired => 0,
}
my $booksellerid = $invoice->{booksellerid};
-my $bookseller = GetBookSellerFromId($booksellerid);
-my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
-my $datereceived = C4::Dates->new();
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
-my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
my @orders = @{ $invoice->{orders} };
my $countlines = scalar @orders;
-my $totalprice = 0;
-my $totalquantity = 0;
-my $total;
my @loop_received = ();
my @book_foot_loop;
my %foot;
-my $total_quantity = 0;
-my $total_gste = 0;
-my $total_gsti = 0;
+my $total_tax_excluded = 0;
+my $total_tax_included = 0;
+my $subtotal_for_funds;
for my $order ( @orders ) {
- $order->{unitprice} = get_value_with_gst_params( $order->{unitprice}, $order->{gstrate}, $bookseller );
- $total = ( $order->{unitprice} ) * $order->{quantityreceived};
$order->{'unitprice'} += 0;
+ $order->{'booksellerid'} = $booksellerid; # required for basket group links
+
+ my $order_object = Koha::Acquisition::Orders->find($order->{ordernumber});
+ if ( $bookseller->invoiceincgst ) {
+ $order->{ecost} = $order->{ecost_tax_included};
+ $order->{unitprice} = $order->{unitprice_tax_included};
+ }
+ else {
+ $order->{ecost} = $order->{ecost_tax_excluded};
+ $order->{unitprice} = $order->{unitprice_tax_excluded};
+ }
+
+ $order->{total} = get_rounded_price($order->{unitprice}) * $order->{quantity};
+
my %line = %{ $order };
- my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
- $line{ecost} = sprintf( "%.2f", $ecost );
$line{invoice} = $invoice->{invoicenumber};
- $line{total} = sprintf($cfstr, $total);
- $line{booksellerid} = $invoice->{booksellerid};
- $line{holds} = 0;
- my @itemnumbers = GetItemnumbersFromOrder( $order->{ordernumber} );
- for my $itemnumber ( @itemnumbers ) {
- my ( $count ) = &GetReservesFromBiblionumber($line{biblionumber}, undef, $itemnumber);
- $line{holds} += $count;
- }
+ my @itemnumbers = $order_object->items->get_column('itemnumber');
+ my $biblio = Koha::Biblios->find( $line{biblionumber} );
+ $line{total_holds} = $biblio ? $biblio->holds->count : 0;
+ $line{item_holds} = $biblio ? $biblio->current_holds->search(
+ {
+ itemnumber => { -in => \@itemnumbers },
+ }
+ )->count : 0;
$line{budget} = GetBudgetByOrderNumber( $line{ordernumber} );
- $totalprice += $order->{unitprice};
- $line{unitprice} = sprintf( $cfstr, $order->{unitprice} );
- my $gste = get_gste( $line{total}, $line{gstrate}, $bookseller );
- my $gst = get_gst( $line{total}, $line{gstrate}, $bookseller );
- $foot{$line{gstrate}}{gstrate} = $line{gstrate};
- $foot{$line{gstrate}}{value} += sprintf( "%.2f", $gst );
- $total_quantity += $line{quantity};
- $total_gste += $gste;
- $total_gsti += $gste + $gst;
+
+ $line{tax_value} = $line{tax_value_on_receiving};
+ $line{tax_rate} = $line{tax_rate_on_receiving};
+ $foot{$line{tax_rate}}{tax_rate} = $line{tax_rate};
+ $foot{$line{tax_rate}}{tax_value} += $line{tax_value};
+ $total_tax_excluded += get_rounded_price($line{unitprice_tax_excluded}) * $line{quantity};
+ $total_tax_included += get_rounded_price($line{unitprice_tax_included}) * $line{quantity};
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
$line{suggestionid} = $suggestion->{suggestionid};
}
}
- my $budget = GetBudget( $line{budget_id} );
- $line{budget_name} = $budget->{'budget_name'};
+ my $budget_name = GetBudgetName( $line{budget_id} );
+ $line{budget_name} = $budget_name;
- push @loop_received, \%line;
- $totalquantity += $order->{quantityreceived};
+ $subtotal_for_funds->{ $line{budget_name} }{ecost} += get_rounded_price($order->{ecost}) * $order->{quantity};
+ $subtotal_for_funds->{ $line{budget_name} }{unitprice} += $order->{total};
+ push @loop_received, \%line;
}
push @book_foot_loop, map { $_ } values %foot;
my @loop_orders = ();
unless( defined $invoice->{closedate} ) {
my $pendingorders;
- if($op eq "search"){
- my $search = $input->param('summaryfilter') || '';
- my $ean = $input->param('eanfilter') || '';
- my $basketname = $input->param('basketfilter') || '';
- my $orderno = $input->param('orderfilter') || '';
- my $basketgroupname = $input->param('basketgroupnamefilter') || '';
+ if ( $op eq "search" or $sticky_filters ) {
+ my ( $search, $ean, $basketname, $orderno, $basketgroupname );
+ if ( $sticky_filters ) {
+ $search = $input->cookie("filter_parcel_summary");
+ $ean = $input->cookie("filter_parcel_ean");
+ $basketname = $input->cookie("filter_parcel_basketname");
+ $orderno = $input->cookie("filter_parcel_orderno");
+ $basketgroupname = $input->cookie("filter_parcel_basketgroupname");
+ } else {
+ $search = $input->param('summaryfilter') || '';
+ $ean = $input->param('eanfilter') || '';
+ $basketname = $input->param('basketfilter') || '';
+ $orderno = $input->param('orderfilter') || '';
+ $basketgroupname = $input->param('basketgroupnamefilter') || '';
+ }
$pendingorders = SearchOrders({
booksellerid => $booksellerid,
basketname => $basketname,
ean => $ean,
basketgroupname => $basketgroupname,
pending => 1,
+ ordered => 1,
});
$template->param(
summaryfilter => $search,
}else{
$pendingorders = SearchOrders({
booksellerid => $booksellerid,
- pending => 1
+ ordered => 1
});
}
my $countpendings = scalar @$pendingorders;
for (my $i = 0 ; $i < $countpendings ; $i++) {
- my %line;
- %line = %{$pendingorders->[$i]};
-
- my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
- $line{unitprice} = get_value_with_gst_params( $line{unitprice}, $line{gstrate}, $bookseller );
- $line{quantity} += 0;
- $line{quantityreceived} += 0;
- $line{unitprice}+=0;
- $line{ecost} = sprintf( "%.2f", $ecost );
- $line{ordertotal} = sprintf( "%.2f", $ecost * $line{quantity} );
- $line{unitprice} = sprintf("%.2f",$line{unitprice});
- $line{invoice} = $invoice;
- $line{booksellerid} = $booksellerid;
+ my $order = $pendingorders->[$i];
+
+ if ( $bookseller->invoiceincgst ) {
+ $order->{ecost} = $order->{ecost_tax_included};
+ } else {
+ $order->{ecost} = $order->{ecost_tax_excluded};
+ }
+ $order->{total} = get_rounded_price($order->{ecost}) * $order->{quantity};
+ my %line = %$order;
+ $line{invoice} = $invoice;
+ $line{booksellerid} = $booksellerid;
my $biblionumber = $line{'biblionumber'};
+ my $biblio = Koha::Biblios->find( $biblionumber );
+ if ( ! $biblio ) {
+ use Data::Dump qw(dump);
+ warn "FATAL ERROR: biblionumber $biblionumber not found in line: ",dump( \%line );
+ }
my $countbiblio = CountBiblioInOrders($biblionumber);
my $ordernumber = $line{'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;
- }
- }
+ my $order_object = Koha::Acquisition::Orders->find($ordernumber);
+ my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;
+ my $itemcount = $biblio ? $biblio->items->count : 0;
+ my $holds_count = $biblio ? $biblio->holds->count : 0;
+ my @itemnumbers = $order_object->items->get_column('itemnumber');
+ my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count : 0;
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
$line{suggestionid} = $suggestion->{suggestionid};
$line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby};
# 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{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @itemnumbers && !($cnt_subscriptions) && !($holds_count);
+ $line{items} = ($itemcount) - (scalar @itemnumbers);
$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} = ($holds >= 1) ? 1 : 0;
+ $line{left_subscription} = 1 if $cnt_subscriptions;
+ $line{subscriptions} = $cnt_subscriptions;
+ $line{left_holds} = ($holds_count >= 1) ? 1 : 0;
$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{holds} = $holds_count;
+ $line{holds_on_order} = $itemholds?$itemholds:$holds_count if $line{left_holds_on_order};
+ $line{basket} = Koha::Acquisition::Baskets->find( $line{basketno} );
- my $budget = GetBudget( $line{budget_id} );
- $line{budget_name} = $budget->{'budget_name'};
+ my $budget_name = GetBudgetName( $line{budget_id} );
+ $line{budget_name} = $budget_name;
push @loop_orders, \%line;
}
invoiceid => $invoice->{invoiceid},
invoice => $invoice->{invoicenumber},
invoiceclosedate => $invoice->{closedate},
- datereceived => $datereceived->output('iso'),
- invoicedatereceived => $datereceived->output('iso'),
- formatteddatereceived => $datereceived->output(),
- name => $bookseller->{'name'},
- booksellerid => $bookseller->{id},
- countreceived => $countlines,
+ datereceived => dt_from_string,
+ name => $bookseller->name,
+ booksellerid => $bookseller->id,
loop_received => \@loop_received,
loop_orders => \@loop_orders,
book_foot_loop => \@book_foot_loop,
- totalprice => sprintf($cfstr, $totalprice),
- totalquantity => $totalquantity,
(uc(C4::Context->preference("marcflavour"))) => 1,
- total_quantity => $total_quantity,
- total_gste => sprintf( "%.2f", $total_gste ),
- total_gsti => sprintf( "%.2f", $total_gsti ),
+ total_tax_excluded => $total_tax_excluded,
+ total_tax_included => $total_tax_included,
+ subtotal_for_funds => $subtotal_for_funds,
+ sticky_filters => $sticky_filters,
);
output_html_with_http_headers $input, $cookie, $template->output;
projects / koha.git / blobdiff