[Koha-cvs] koha C4/Members.pm acqui/neworderempty.pl acqui...
paul poulain
paul at koha-fr.org
Fri May 4 15:59:54 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/05/04 13:59:54
Modified files:
C4 : Members.pm
acqui : neworderempty.pl parcel.pl
koha-tmpl/intranet-tmpl/prog/en/acqui: histsearch.tmpl
parcels.tmpl
Log message:
bugfixes for acquisition module
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/neworderempty.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcel.pl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl?cvsroot=koha&r1=1.5&r2=1.6
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- C4/Members.pm 25 Apr 2007 14:07:34 -0000 1.51
+++ C4/Members.pm 4 May 2007 13:59:53 -0000 1.52
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.51 2007/04/25 14:07:34 hdl Exp $
+# $Id: Members.pm,v 1.52 2007/05/04 13:59:53 tipaul Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.51 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.52 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -1637,7 +1637,7 @@
my $dbh = C4::Context->dbh;
unless ($date){
$date=POSIX::strftime("%Y-%m-%d",localtime(time));
- my $borrower = GetBorrower($borrowerid,'borrowernumber');
+ my $borrower = GetMember($borrowerid,'borrowernumber');
$date = GetExpiryDate( $borrower->{'categorycode'}, $date );
}
my $sth = $dbh->do(<<EOF);
Index: acqui/neworderempty.pl
===================================================================
RCS file: /sources/koha/koha/acqui/neworderempty.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- acqui/neworderempty.pl 24 Apr 2007 13:54:28 -0000 1.6
+++ acqui/neworderempty.pl 4 May 2007 13:59:54 -0000 1.7
@@ -184,7 +184,7 @@
$template->param( branchloop => \@branchloop );
# build bookfund list
-my $borrower= GetBorrower($loggedinuser);
+my $borrower= GetMember($loggedinuser);
my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});
my $count2;
Index: acqui/parcel.pl
===================================================================
RCS file: /sources/koha/koha/acqui/parcel.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- acqui/parcel.pl 24 Apr 2007 13:54:28 -0000 1.6
+++ acqui/parcel.pl 4 May 2007 13:59:54 -0000 1.7
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: parcel.pl,v 1.6 2007/04/24 13:54:28 hdl Exp $
+# $Id: parcel.pl,v 1.7 2007/05/04 13:59:54 tipaul Exp $
#script to recieve orders
#written by chris at katipo.co.nz 24/2/2000
@@ -73,7 +73,7 @@
my $invoice=$input->param('invoice') || '';
my $freight=$input->param('freight');
my $gst=$input->param('gst');
-my $datereceived=$input->param('datereceived') || format_date(join "-",Date::Calc::Today());
+my $datereceived=format_date_in_iso($input->param('datereceived')) || format_date(join "-",Date::Calc::Today());
my $code=$input->param('code');
my ($template, $loggedinuser, $cookie)
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl 11 Mar 2007 21:08:11 -0000 1.7
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/histsearch.tmpl 4 May 2007 13:59:54 -0000 1.8
@@ -92,7 +92,7 @@
<tr>
<td>
<!-- TMPL_IF NAME="invoicenumber" -->
- <a href="/cgi-bin/koha/acqui/parcel.pl?code=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
+ <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=<!-- TMPL_VAR NAME="invoicenumber"-->&supplierid=<!-- TMPL_VAR NAME="id"-->&datereceived=<!-- TMPL_VAR NAME="datereceived" -->">Parcel</a>
<!-- TMPL_ELSE -->
<!-- /TMPL_IF -->
Index: koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl 11 Mar 2007 21:08:11 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/acqui/parcels.tmpl 4 May 2007 13:59:54 -0000 1.6
@@ -84,7 +84,7 @@
</td>
<!-- TMPL_IF NAME="hilighted" --><td class="hilighted number"><!-- TMPL_ELSE --><td class="number">
<!-- /TMPL_IF -->
- <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&code=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
+ <a href="/cgi-bin/koha/acqui/parcel.pl?type=intra&supplierid=<!-- TMPL_VAR NAME="supplierid" ESCAPE=URL -->&datereceived=<!-- TMPL_VAR NAME="raw_datereceived" ESCAPE=URL --><!--TMPL_IF Name="code"-->&invoice=<!--TMPL_VAR Name="code" ESCAPE=URL --><!--/TMPL_IF-->">
<!-- TMPL_VAR NAME="datereceived" -->
</a>
</td>
More information about the Koha-cvs
mailing list