[Koha-cvs] CVS: koha/admin categorie.pl,1.12,1.13

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv8120/admin

Modified Files:
        categorie.pl 
Log Message:
fixes for #395

Index: categorie.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/categorie.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** categorie.pl        6 May 2003 14:55:39 -0000       1.12
--- categorie.pl        13 Jun 2003 14:41:34 -0000      1.13
***************
*** 97,101 ****
        if ($categorycode) {
                my $dbh = C4::Context->dbh;
!               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
                $sth->execute;
                $data=$sth->fetchrow_hashref;
--- 97,101 ----
        if ($categorycode) {
                my $dbh = C4::Context->dbh;
!               my $sth=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
                $sth->execute;
                $data=$sth->fetchrow_hashref;
***************
*** 107,112 ****
                                upperagelimit           => 
$data->{'upperagelimit'},
                                dateofbirthrequired     => 
$data->{'dateofbirthrequired'},
-                               finetype                => $data->{'finetype'},
-                               bulk                    => $data->{'bulk'},
                                enrolmentfee            => 
$data->{'enrolmentfee'},
                                overduenoticerequired   => 
$data->{'overduenoticerequired'},
--- 107,110 ----
***************
*** 119,123 ****
        $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
!       my $query = "replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired)
 values (";
        $query.= $dbh->quote($input->param('categorycode')).",";
        $query.= $dbh->quote($input->param('description')).",";
--- 117,121 ----
        $template->param(add_validate => 1);
        my $dbh = C4::Context->dbh;
!       my $query = "replace categories 
(categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired)
 values (";
        $query.= $dbh->quote($input->param('categorycode')).",";
        $query.= $dbh->quote($input->param('description')).",";
***************
*** 125,130 ****
        $query.= $dbh->quote($input->param('upperagelimit')).",";
        $query.= $dbh->quote($input->param('dateofbirthrequired')).",";
-       $query.= $dbh->quote($input->param('finetype')).",";
-       $query.= $dbh->quote($input->param('bulk')).",";
        $query.= $dbh->quote($input->param('enrolmentfee')).",";
        $query.= $dbh->quote($input->param('issuelimit')).",";
--- 123,126 ----
***************
*** 147,151 ****
        $template->param(total => $total->{'total'});
        
!       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,finetype,bulk,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
        $sth2->execute;
        my $data=$sth2->fetchrow_hashref;
--- 143,147 ----
        $template->param(total => $total->{'total'});
        
!       my $sth2=$dbh->prepare("select 
categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired
 from categories where categorycode='$categorycode'");
        $sth2->execute;
        my $data=$sth2->fetchrow_hashref;
***************
*** 159,164 ****
                                  upperagelimit           => 
$data->{'upperagelimit'},
                                  dateofbirthrequired     => 
$data->{'dateofbirthrequired'},
-                                 finetype                => 
$data->{'finetype'},
-                                 bulk                    => $data->{'bulk'},
                                  enrolmentfee            => 
$data->{'enrolmentfee'},
                                  overduenoticerequired   => 
$data->{'overduenoticerequired'},
--- 155,158 ----
***************
*** 191,196 ****
                                upperagelimit => 
$results->[$i]{'upperagelimit'},
                                dateofbirthrequired => 
$results->[$i]{'dateofbirthrequired'},
-                               finetype => $results->[$i]{'finetype'},
-                               bulk => $results->[$i]{'bulk'},
                                enrolmentfee => $results->[$i]{'enrolmentfee'},
                                overduenoticerequired => 
$results->[$i]{'overduenoticerequired'},
--- 185,188 ----