[Koha-patches] [PATCH] parcel.pl cleanup
Joe Atzberger
joe.atzberger at liblime.com
Wed Apr 8 00:37:52 CEST 2009
It looks like a lot of change, but it isn't much:
perltidy, removed unused "toggle" code, and corrected comments.
---
acqui/parcel.pl | 225 ++++++++++++++++++++++++++----------------------------
1 files changed, 108 insertions(+), 117 deletions(-)
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index e6fa893..62c77e4 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -1,10 +1,8 @@
#!/usr/bin/perl
-
-#script to recieve orders
+#script to receive orders
#written by chris at katipo.co.nz 24/2/2000
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -22,7 +20,6 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-
=head1 NAME
parcel.pl
@@ -64,144 +61,138 @@ use C4::Dates qw/format_date format_date_in_iso/;
use strict;
-my $input=new CGI;
-my $supplierid=$input->param('supplierid');
-my $bookseller=GetBookSellerFromId($supplierid);
-
-my $invoice=$input->param('invoice') || '';
-my $freight=$input->param('freight');
-my $gst=$input->param('gst');
-my $datereceived = ($input->param('op') eq 'new') ? C4::Dates->new($input->param('datereceived'))
- : C4::Dates->new($input->param('datereceived'), 'iso') ;
+my $input = new CGI;
+my $supplierid = $input->param('supplierid');
+my $bookseller = GetBookSellerFromId($supplierid);
+
+my $invoice = $input->param('invoice') || '';
+my $freight = $input->param('freight');
+my $gst = $input->param('gst');
+my $datereceived =
+ ($input->param('op') eq 'new')
+ ? C4::Dates->new($input->param('datereceived'))
+ : C4::Dates->new($input->param('datereceived'), 'iso');
$datereceived = C4::Dates->new() unless $datereceived;
-my $code=$input->param('code');
-my @rcv_err = $input->param('error');
+my $code = $input->param('code');
+my @rcv_err = $input->param('error');
my @rcv_err_barcode = $input->param('error_bc');
-my ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "acqui/parcel.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {acquisition => 1},
- debug => 1,
-});
-
-# 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 ($template, $loggedinuser, $cookie) = get_template_and_user(
+ { template_name => "acqui/parcel.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { acquisition => 1 },
+ debug => 1,
+ }
+);
+
+# If receiving error, report the error (coming from finishreceive.pl).
+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 $cfstr = "%.2f"; # currency format string -- could get this from currency table.
-my @parcelitems=GetParcel($supplierid,$invoice,$datereceived->output('iso'));
-my $countlines = scalar @parcelitems;
-my $totalprice=0;
-my $totalfreight=0;
-my $totalquantity=0;
+my $cfstr = "%.2f"; # currency format string -- could get this from currency table.
+my @parcelitems = GetParcel($supplierid, $invoice, $datereceived->output('iso'));
+my $countlines = scalar @parcelitems;
+my $totalprice = 0;
+my $totalfreight = 0;
+my $totalquantity = 0;
my $total;
my $tototal;
-my $toggle;
my @loop_received = ();
-for (my $i=0;$i<$countlines;$i++){
+
+for (my $i = 0 ; $i < $countlines ; $i++) {
+
#$total=($parcelitems[$i]->{'unitprice'} + $parcelitems[$i]->{'freight'}) * $parcelitems[$i]->{'quantityreceived'}; #weird, are the freight fees counted by book? (pierre)
- $total=($parcelitems[$i]->{'unitprice'} ) * $parcelitems[$i]->{'quantityreceived'}; #weird, are the freight fees counted by book? (pierre)
- $parcelitems[$i]->{'unitprice'}+=0;
+ $total = ($parcelitems[$i]->{'unitprice'}) * $parcelitems[$i]->{'quantityreceived'}; #weird, are the freight fees counted by book? (pierre)
+ $parcelitems[$i]->{'unitprice'} += 0;
my %line;
- if ($toggle==0){
- $line{color}='#EEEEEE';
- $toggle=1;
- } else {
- $line{color}='white';
- $toggle=0;
- }
- %line = %{$parcelitems[$i]};
+ %line = %{ $parcelitems[$i] };
$line{invoice} = $invoice;
- $line{gst} = $gst;
- $line{total} = sprintf($cfstr,$total);
+ $line{gst} = $gst;
+ $line{total} = sprintf($cfstr, $total);
$line{supplierid} = $supplierid;
push @loop_received, \%line;
- $totalprice+=$parcelitems[$i]->{'unitprice'};
- $line{unitprice} = sprintf($cfstr,$parcelitems[$i]->{'unitprice'});
-#double FIXME - totalfreight is redefined later.
-
- # FIXME - each order in a parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
- if ( $i > 0 && $totalfreight != $parcelitems[$i]->{'freight'}) {
- warn "FREIGHT CHARGE MISMATCH!!";
- }
- $totalfreight=$parcelitems[$i]->{'freight'};
- $totalquantity+=$parcelitems[$i]->{'quantityreceived'};
- $tototal+=$total;
+ $totalprice += $parcelitems[$i]->{'unitprice'};
+ $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'});
+
+ #double FIXME - totalfreight is redefined later.
+
+# FIXME - each order in a parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget..
+ if ($i > 0 && $totalfreight != $parcelitems[$i]->{'freight'}) {
+ warn "FREIGHT CHARGE MISMATCH!!";
+ }
+ $totalfreight = $parcelitems[$i]->{'freight'};
+ $totalquantity += $parcelitems[$i]->{'quantityreceived'};
+ $tototal += $total;
}
my $pendingorders = GetPendingOrders($supplierid);
my $countpendings = scalar @$pendingorders;
# pending orders totals
-my ($totalPunitprice,$totalPquantity,$totalPecost, $totalPqtyrcvd);
+my ($totalPunitprice, $totalPquantity, $totalPecost, $totalPqtyrcvd);
my $ordergrandtotal;
my @loop_orders = ();
-for (my $i=0;$i<$countpendings;$i++){
+for (my $i = 0 ; $i < $countpendings ; $i++) {
my %line;
- if ($toggle==0){
- $line{color}='#EEEEEE';
- $toggle=1;
- } else {
- $line{color}='white';
- $toggle=0;
- }
- %line = %{$pendingorders->[$i]};
- $line{quantity}+=0;
- $line{quantityreceived}+=0;
- $line{unitprice}+=0;
- $totalPunitprice += $line{unitprice};
- $totalPquantity +=$line{quantity};
- $totalPqtyrcvd +=$line{quantityreceived};
- $totalPecost += $line{ecost};
- $line{ecost} = sprintf("%.2f",$line{ecost});
- $line{ordertotal} = sprintf("%.2f",$line{ecost}*$line{quantity});
- $line{unitprice} = sprintf("%.2f",$line{unitprice});
- $line{invoice} = $invoice;
- $line{gst} = $gst;
- $line{total} = $total;
+ %line = %{ $pendingorders->[$i] };
+ $line{quantity} += 0;
+ $line{quantityreceived} += 0;
+ $line{unitprice} += 0;
+ $totalPunitprice += $line{unitprice};
+ $totalPquantity += $line{quantity};
+ $totalPqtyrcvd += $line{quantityreceived};
+ $totalPecost += $line{ecost};
+ $line{ecost} = sprintf("%.2f", $line{ecost});
+ $line{ordertotal} = sprintf("%.2f", $line{ecost} * $line{quantity});
+ $line{unitprice} = sprintf("%.2f", $line{unitprice});
+ $line{invoice} = $invoice;
+ $line{gst} = $gst;
+ $line{total} = $total;
$line{supplierid} = $supplierid;
- $ordergrandtotal += $line{ecost}*$line{quantity};
+ $ordergrandtotal += $line{ecost} * $line{quantity};
push @loop_orders, \%line;
}
$freight = $totalfreight unless $freight;
+
#$totalfreight=$freight;
-$tototal=$tototal+$freight;
-
-$template->param(invoice => $invoice,
- datereceived => $datereceived->output('iso'),
- invoicedatereceived => $datereceived->output('iso'),
- formatteddatereceived => $datereceived->output(),
- name => $bookseller->{'name'},
- supplierid => $supplierid,
- gst => $gst,
- freight => $freight,
- invoice => $invoice,
- countreceived => $countlines,
- loop_received => \@loop_received,
- countpending => $countpendings,
- loop_orders => \@loop_orders,
- totalprice => sprintf($cfstr,$totalprice),
- totalfreight => $totalfreight,
- totalquantity => $totalquantity,
- tototal => sprintf($cfstr,$tototal),
- ordergrandtotal => sprintf($cfstr,$ordergrandtotal),
- gst => $gst,
- grandtot => sprintf($cfstr,$tototal+$gst),
- totalPunitprice => sprintf("%.2f",$totalPunitprice),
- totalPquantity => $totalPquantity,
- totalPqtyrcvd => $totalPqtyrcvd,
- totalPecost => sprintf("%.2f",$totalPecost),
- );
+$tototal = $tototal + $freight;
+
+$template->param(
+ invoice => $invoice,
+ datereceived => $datereceived->output('iso'),
+ invoicedatereceived => $datereceived->output('iso'),
+ formatteddatereceived => $datereceived->output(),
+ name => $bookseller->{'name'},
+ supplierid => $supplierid,
+ gst => $gst,
+ freight => $freight,
+ invoice => $invoice,
+ countreceived => $countlines,
+ loop_received => \@loop_received,
+ countpending => $countpendings,
+ loop_orders => \@loop_orders,
+ totalprice => sprintf($cfstr, $totalprice),
+ totalfreight => $totalfreight,
+ totalquantity => $totalquantity,
+ tototal => sprintf($cfstr, $tototal),
+ ordergrandtotal => sprintf($cfstr, $ordergrandtotal),
+ gst => $gst,
+ grandtot => sprintf($cfstr, $tototal + $gst),
+ totalPunitprice => sprintf("%.2f", $totalPunitprice),
+ totalPquantity => $totalPquantity,
+ totalPqtyrcvd => $totalPqtyrcvd,
+ totalPecost => sprintf("%.2f", $totalPecost),
+);
output_html_with_http_headers $input, $cookie, $template->output;
--
1.5.6.5
More information about the Koha-patches
mailing list