[Koha-cvs] CVS: koha/C4 Bull.pm,1.6.2.14,1.6.2.15
Paul POULAIN
tipaul at users.sourceforge.net
Wed Sep 14 16:03:24 CEST 2005
Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25316/C4
Modified Files:
Tag: rel_2_2
Bull.pm
Log Message:
fixing a bug in status format
Index: Bull.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Bull.pm,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -C2 -r1.6.2.14 -r1.6.2.15
*** Bull.pm 9 Sep 2005 10:11:38 -0000 1.6.2.14
--- Bull.pm 14 Sep 2005 14:03:22 -0000 1.6.2.15
***************
*** 186,189 ****
--- 186,190 ----
$subs->{recievedlist} =~ s/\n/\<br\/\>/g;
$subs->{"periodicity".$subs->{periodicity}} = 1;
+ $subs->{"status".$subs->{'status'}} = 1;
if ($subs->{enddate} eq '0000-00-00') {
$subs->{enddate}='';
***************
*** 199,203 ****
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, year(serial.planneddate) as year,subscription.*, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
--- 200,204 ----
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
! my $sth = $dbh->prepare('select serial.serialseq, serial.planneddate, serial.status, serial.notes, year(serial.planneddate) as year, aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,biblio.title as bibliotitle
from serial left join subscription on (serial.subscriptionid=subscription.subscriptionid and subscription.biblionumber=serial.biblionumber)
left join aqbudget on subscription.aqbudgetid=aqbudget.aqbudgetid
***************
*** 227,234 ****
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
! 'status1' => $subs->{'status'}==1,
! 'status2' => $subs->{'status'}==2,
! 'status3' => $subs->{'status'}==3,
! 'status4' => $subs->{'status'}==4,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
--- 228,232 ----
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
! "status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
***************
*** 243,250 ****
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
! 'status1' => $subs->{'status'}==1,
! 'status2' => $subs->{'status'}==2,
! 'status3' => $subs->{'status'}==3,
! 'status4' => $subs->{'status'}==4,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
--- 241,245 ----
{'planneddate' => format_date($subs->{'planneddate'}),
'serialseq' => $subs->{'serialseq'},
! "status".$subs->{'status'} => 1,
'notes' => $subs->{'notes'} eq $previousnote?"":$subs->{notes},
};
More information about the Koha-cvs
mailing list