[Koha-patches] [PATCH 30/78] parcels management
paul.poulain at biblibre.com
paul.poulain at biblibre.com
Thu May 28 18:32:40 CEST 2009
From: Paul Poulain <paul.poulain at biblibre.com>
* deal with granular perms
* deal with bookseller level GST
---
acqui/parcel.pl | 103 ++++++++++---------
acqui/parcels.pl | 4 +-
.../prog/en/modules/acqui/parcel.tmpl | 10 +-
3 files changed, 61 insertions(+), 56 deletions(-)
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 62c77e4..15a08e7 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -1,9 +1,10 @@
#!/usr/bin/perl
-#script to receive orders
-#written by chris at katipo.co.nz 24/2/2000
+#script to recieve orders
+
# Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
#
# This file is part of Koha.
#
@@ -61,44 +62,40 @@ 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') || $bookseller->{gstrate} || C4::Context->preference("gist") || 0;
+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 @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 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 ($template, $loggedinuser, $cookie)
+ = get_template_and_user({template_name => "acqui/parcel.tmpl",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => {acquisition => 'order_receive'},
+ 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 $cfstr = "%.2f"; # currency format string -- could get this from currency table.
@@ -146,20 +143,28 @@ my $ordergrandtotal;
my @loop_orders = ();
for (my $i = 0 ; $i < $countpendings ; $i++) {
my %line;
- %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;
+ if ($toggle==0){
+ $line{color}='#EEEEEE';
+ $toggle=1;
+ } else {
+ $line{color}='white';
+ $toggle=0;
+ }
+ %line = %{$pendingorders->[$i]};
+ $line{quantity}+=0;
+ $line{quantrem} = $line{quantity} - $line{quantityreceived};
+ $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};
push @loop_orders, \%line;
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 30dc0a6..749c756 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -2,10 +2,10 @@
#script to show display basket of orders
-#written by chris at katipo.co.nz 24/2/2000
# Copyright 2000-2002 Katipo Communications
+# Copyright 2008-2009 BibLibre SARL
#
# This file is part of Koha.
#
@@ -84,7 +84,7 @@ my ($template, $loggedinuser, $cookie)
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {acquisition => 1},
+ flagsrequired => {acquisition => 'order_receive'},
debug => 1,
});
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index d6e5c2c..505bf77 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -47,24 +47,24 @@
<form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
<table>
<tr>
- <th>Quantity</th>
+ <th>Quantity/Edit order</th>
<th>Basket/Order</th>
<th>Summary</th>
- <th>View Record</th>
+ <th>View Record/Edit shipment</th>
<th>Est cost</th>
<th>Actual cost</th>
<th>TOTAL</th>
</tr>
<!-- TMPL_LOOP NAME="loop_received" -->
<tr>
- <td><!-- TMPL_VAR NAME="quantityreceived" --></td>
+ <td><a href="neworderempty.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="quantityreceived" --></a></td>
<td><a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="basketno" --></a> / <!-- TMPL_VAR NAME="ordernumber" --></td>
<td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a>
<!-- TMPL_IF NAME="isbn" --><br />ISBN: <!-- TMPL_VAR NAME="isbn" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!-- TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
</td>
- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">View MARC</a></td>
+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!-- TMPL_VAR NAME="biblionumber" -->" title="MARC" rel="gb_page_center[600,500]">View MARC</a>/<a href="orderreceive.pl?op=edit&ordernumber=<!-- TMPL_VAR name="ordernumber" -->&biblionumber=<!-- TMPL_VAR name="biblionumber" -->&supplierid=<!-- TMPL_VAR name="supplierid" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&datereceived=<!-- TMPL_VAR name="datereceived" -->" >Edit shipment</a></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="unitprice" --></td>
<td><!-- TMPL_VAR NAME="total" --></td>
@@ -137,7 +137,7 @@
<td> <!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="ordertotal" --></td>
- <td><a href="orderreceive.pl?receive=<!-- TMPL_VAR NAME="ordernumber" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&datereceived=<!-- TMPL_VAR NAME="invoicedatereceived" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Receive order</a></td>
+ <td><a href="orderreceive.pl?ordernumber=<!-- TMPL_VAR NAME="ordernumber" -->&datereceived=<!-- TMPL_VAR NAME="invoicedatereceived" -->&invoice=<!-- TMPL_VAR NAME="invoice" -->&gst=<!-- TMPL_VAR NAME="gst" -->&freight=<!-- TMPL_VAR NAME="freight" -->&supplierid=<!-- TMPL_VAR NAME="supplierid" -->">Receive order</a></td>
</tr>
<!-- /TMPL_LOOP -->
<tr><td colspan="2"> </td>
--
1.6.0.4
More information about the Koha-patches
mailing list