[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] CVS: koha/bull lateissues.pl,1.1,1.2 statecollection.pl,1.7,1
From: |
Paul POULAIN |
Subject: |
[Koha-cvs] CVS: koha/bull lateissues.pl,1.1,1.2 statecollection.pl,1.7,1.8 |
Date: |
Wed, 26 Oct 2005 02:11:52 -0700 |
Update of /cvsroot/koha/koha/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28634/bull
Modified Files:
lateissues.pl statecollection.pl
Log Message:
big commit, still breaking things...
* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not
be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued
Index: lateissues.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/lateissues.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** lateissues.pl 3 Dec 2004 14:34:54 -0000 1.1
--- lateissues.pl 26 Oct 2005 09:11:50 -0000 1.2
***************
*** 5,8 ****
--- 5,9 ----
use C4::Auth;
use C4::Bull;
+ use C4::Acquisition;
use C4::Output;
use C4::Interface::CGI::Output;
***************
*** 31,34 ****
--- 32,39 ----
my @lateissues;
@lateissues = GetLateIssues($supplierid) if $supplierid;
+ my @supplierinfo;
+ my $nothing;
+ ($nothing,@supplierinfo)=bookseller($supplierid) if $supplierid;
+
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "bull/lateissues.tmpl",
***************
*** 42,46 ****
$template->param(
CGIsupplier => $CGIsupplier,
! lateissues => address@hidden
);
output_html_with_http_headers $query, $cookie, $template->output;
--- 47,54 ----
$template->param(
CGIsupplier => $CGIsupplier,
! lateissues => address@hidden,
! phone => $supplierinfo[0]->{phone},
! booksellerfax => $supplierinfo[0]->{booksellerfax},
! bookselleremail => $supplierinfo[0]->{bookselleremail},
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: statecollection.pl
===================================================================
RCS file: /cvsroot/koha/koha/bull/statecollection.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** statecollection.pl 24 Aug 2005 08:49:03 -0000 1.7
--- statecollection.pl 26 Oct 2005 09:11:50 -0000 1.8
***************
*** 38,41 ****
--- 38,42 ----
my $hassubscriptionexpired = hassubscriptionexpired($subscriptionid);
+ my $subscription=getsubscription($subscriptionid);
if ($op eq 'modsubscriptionhistory') {
modsubscriptionhistory($subscriptionid,$histstartdate,$enddate,$recievedlist,$missinglist,$opacnote,$librariannote);
***************
*** 67,70 ****
--- 68,72 ----
$template->param(
serialslist => address@hidden,
+ biblionumber => $subscription->{biblionumber},
histstartdate =>
format_date($solhistory->{'histstartdate'}),
enddate => format_date($solhistory->{'enddate'}),
***************
*** 75,78 ****
--- 77,81 ----
subscriptionid => $subscriptionid,
bibliotitle => $subs->{bibliotitle},
+ biblionumber => $subs->{biblionumber},
hassubscriptionexpired =>$hassubscriptionexpired,
);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] CVS: koha/bull lateissues.pl,1.1,1.2 statecollection.pl,1.7,1.8,
Paul POULAIN <=
- Prev by Date:
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.61,1.62 additem-nomarc.pl,1.7,1.8 additem.pl,1.34,1.35
- Next by Date:
[Koha-cvs] CVS: koha/barcodes barcodes.pl,1.3,1.4
- Previous by thread:
[Koha-cvs] CVS: koha/acqui.simple addbiblio.pl,1.61,1.62 additem-nomarc.pl,1.7,1.8 additem.pl,1.34,1.35
- Next by thread:
[Koha-cvs] CVS: koha/barcodes barcodes.pl,1.3,1.4
- Index(es):