#!/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
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 JSON;
-my $input=new CGI;
+use Koha::Acquisition::Bookseller;
+use Koha::Biblios;
+use Koha::DateUtils;
+use Koha::Biblios;
-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;
- }
- }
-}
-
-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,
debug => 1,
});
-my $invoiceid = $input->param('invoiceid');
my $op = $input->param('op') // '';
+# process cancellation first so that list of
+# orders to display is calculated after
if ($op eq 'cancelreceipt') {
my $ordernumber = $input->param('ordernumber');
my $parent_ordernumber = CancelReceipt($ordernumber);
}
}
-my $invoice = GetInvoiceDetails($invoiceid);
-my $booksellerid = $invoice->{booksellerid};
-my $bookseller = GetBookSellerFromId($booksellerid);
-my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0;
-my $datereceived = C4::Dates->new();
-my $code = $input->param('code');
-my @rcv_err = $input->param('error');
-my @rcv_err_barcode = $input->param('error_bc');
-my $startfrom=$input->param('startfrom');
-my $resultsperpage = $input->param('resultsperpage');
-$resultsperpage = 20 unless ($resultsperpage);
-$startfrom=0 unless ($startfrom);
-
-
-
-# If receiving error, report the error (coming from finishrecieve.pl(sic)).
-if( scalar(@rcv_err) ) {
- my $cnt=0;
- my $error_loop;
- for my $err (@rcv_err) {
- push @$error_loop, { "error_$err" => 1 , barcode => $rcv_err_barcode[$cnt] };
- $cnt++;
- }
- $template->param( receive_error => 1 ,
- error_loop => $error_loop,
- );
+my $invoiceid = $input->param('invoiceid');
+my $invoice;
+$invoice = GetInvoiceDetails($invoiceid) if $invoiceid;
+
+unless( $invoiceid and $invoice->{invoiceid} ) {
+ $template->param(
+ error_invoice_not_known => 1,
+ no_orders_to_display => 1
+ );
+ output_html_with_http_headers $input, $cookie, $template->output;
+ exit;
}
-my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
-my @parcelitems = @{ $invoice->{orders} };
-my $countlines = scalar @parcelitems;
-my $totalprice = 0;
-my $totalquantity = 0;
-my $total;
+my $booksellerid = $invoice->{booksellerid};
+my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
+
+my @orders = @{ $invoice->{orders} };
+my $countlines = scalar @orders;
my @loop_received = ();
my @book_foot_loop;
my %foot;
-my $total_quantity = 0;
-my $total_gste = 0;
-my $total_gsti = 0;
-
-for my $item ( @parcelitems ) {
- $item->{unitprice} = get_value_with_gst_params( $item->{unitprice}, $item->{gstrate}, $bookseller );
- $total = ( $item->{'unitprice'} ) * $item->{'quantityreceived'};
- $item->{'unitprice'} += 0;
- my %line;
- %line = %{ $item };
- my $ecost = get_value_with_gst_params( $line{ecost}, $line{gstrate}, $bookseller );
- $line{ecost} = sprintf( "%.2f", $ecost );
+my $total_tax_excluded = 0;
+my $total_tax_included = 0;
+
+my $subtotal_for_funds;
+for my $order ( @orders ) {
+ $order->{'unitprice'} += 0;
+
+ 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} = $order->{unitprice} * $order->{quantity};
+
+ my %line = %{ $order };
$line{invoice} = $invoice->{invoicenumber};
- $line{total} = sprintf($cfstr, $total);
- $line{booksellerid} = $invoice->{booksellerid};
- $totalprice += $item->{'unitprice'};
- $line{unitprice} = sprintf( $cfstr, $item->{'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{holds} = 0;
+ my @itemnumbers = GetItemnumbersFromOrder( $order->{ordernumber} );
+ my $biblio = Koha::Biblios->find( $order->{ordernumber} );
+ $line{holds} = $biblio->current_holds->search(
+ {
+ itemnumber => { -in => \@itemnumbers },
+ }
+ )->count;
+ $line{budget} = GetBudgetByOrderNumber( $line{ordernumber} );
+
+ $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 += $line{unitprice_tax_excluded} * $line{quantity};
+ $total_tax_included += $line{unitprice_tax_included} * $line{quantity};
my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber});
$line{suggestionid} = $suggestion->{suggestionid};
if ( $line{parent_ordernumber} != $line{ordernumber} ) {
if ( grep { $_->{ordernumber} == $line{parent_ordernumber} }
- @parcelitems )
+ @orders
+ )
{
$line{cannot_cancel} = 1;
}
}
- 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 += $item->{'quantityreceived'};
+ $subtotal_for_funds->{ $line{budget_name} }{ecost} += $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 = ();
-if(!defined $invoice->{closedate}) {
+unless( defined $invoice->{closedate} ) {
my $pendingorders;
- if($input->param('op') eq "search"){
- my $search = $input->param('summaryfilter') || '';
- my $ean = $input->param('eanfilter') || '';
- my $basketno = $input->param('basketfilter') || '';
- my $orderno = $input->param('orderfilter') || '';
- my $grouped;
- my $owner;
- $pendingorders = GetPendingOrders($booksellerid,$grouped,$owner,$basketno,$orderno,$search,$ean);
+ 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,
+ ordernumber => $orderno,
+ search => $search,
+ ean => $ean,
+ basketgroupname => $basketgroupname,
+ pending => 1,
+ ordered => 1,
+ });
+ $template->param(
+ summaryfilter => $search,
+ eanfilter => $ean,
+ basketfilter => $basketname,
+ orderfilter => $orderno,
+ basketgroupnamefilter => $basketgroupname,
+ );
}else{
- $pendingorders = GetPendingOrders($booksellerid);
+ $pendingorders = SearchOrders({
+ booksellerid => $booksellerid,
+ 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} = $order->{ecost} * $order->{quantity};
+ my %line = %$order;
+
+ $line{invoice} = $invoice;
+ $line{booksellerid} = $booksellerid;
my $biblionumber = $line{'biblionumber'};
+ my $biblio = Koha::Biblios->find( $biblionumber );
my $countbiblio = CountBiblioInOrders($biblionumber);
my $ordernumber = $line{'ordernumber'};
my @subscriptions = GetSubscriptionsId ($biblionumber);
- my $itemcount = GetItemsCount($biblionumber);
- my $holds = GetHolds ($biblionumber);
+ my $itemcount = $biblio->items->count;
+ my $holds_count = $biblio->holds->count;
my @items = GetItemnumbersFromOrder( $ordernumber );
my $itemholds;
foreach my $item (@items){
$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{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds_count);
$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} = ($holds >= 1) ? 1 : 0;
+ $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};
-
- my $budget = GetBudget( $line{budget_id} );
- $line{budget_name} = $budget->{'budget_name'};
-
- push @loop_orders, \%line if ($i >= $startfrom and $i < $startfrom + $resultsperpage);
- }
+ $line{holds} = $holds_count;
+ $line{holds_on_order} = $itemholds?$itemholds:$holds_count if $line{left_holds_on_order};
- my $count = $countpendings;
+ my $budget_name = GetBudgetName( $line{budget_id} );
+ $line{budget_name} = $budget_name;
- if ($count>$resultsperpage){
- my $displaynext=0;
- my $displayprev=$startfrom;
- if(($count - ($startfrom+$resultsperpage)) > 0 ) {
- $displaynext = 1;
- }
-
- my @numbers = ();
- for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
- my $highlight=0;
- ($startfrom/$resultsperpage==($i-1)) && ($highlight=1);
- push @numbers, { number => $i,
- highlight => $highlight ,
- startfrom => ($i-1)*$resultsperpage};
- }
-
- my $from = $startfrom*$resultsperpage+1;
- my $to;
- if($count < (($startfrom+1)*$resultsperpage)){
- $to = $count;
- } else {
- $to = (($startfrom+1)*$resultsperpage);
- }
- $template->param(numbers=>\@numbers,
- displaynext=>$displaynext,
- displayprev=>$displayprev,
- nextstartfrom=>(($startfrom+$resultsperpage<$count)?$startfrom+$resultsperpage:$count),
- prevstartfrom=>(($startfrom-$resultsperpage>0)?$startfrom-$resultsperpage:0)
- );
+ push @loop_orders, \%line;
}
$template->param(
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,
- booksellerid => $booksellerid,
loop_orders => \@loop_orders,
book_foot_loop => \@book_foot_loop,
- totalprice => sprintf($cfstr, $totalprice),
- totalquantity => $totalquantity,
- resultsperpage => $resultsperpage,
(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