From 5e3ed3cbad0b6ccd7ba81c56a22fe473af5ae859 Mon Sep 17 00:00:00 2001 From: tipaul Date: Fri, 13 Jun 2003 14:41:32 +0000 Subject: [PATCH] fixes for #395 --- admin/categorie.pl | 14 +++-------- .../default/en/parameters/categorie.tmpl | 25 ++++++------------- .../default/fr/parameters/categorie.tmpl | 25 ++++++------------- 3 files changed, 19 insertions(+), 45 deletions(-) diff --git a/admin/categorie.pl b/admin/categorie.pl index 8584e65393..c3eec264b7 100755 --- a/admin/categorie.pl +++ b/admin/categorie.pl @@ -96,7 +96,7 @@ if ($op eq 'add_form') { my $data; 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'"); + 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; $sth->finish; @@ -106,8 +106,6 @@ if ($op eq 'add_form') { enrolmentperiod => $data->{'enrolmentperiod'}, upperagelimit => $data->{'upperagelimit'}, dateofbirthrequired => $data->{'dateofbirthrequired'}, - finetype => $data->{'finetype'}, - bulk => $data->{'bulk'}, enrolmentfee => $data->{'enrolmentfee'}, overduenoticerequired => $data->{'overduenoticerequired'}, issuelimit => $data->{'issuelimit'}, @@ -118,14 +116,12 @@ if ($op eq 'add_form') { } elsif ($op eq 'add_validate') { $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 ("; + 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')).","; $query.= $dbh->quote($input->param('enrolmentperiod')).","; $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')).","; $query.= $dbh->quote($input->param('reservefee')).","; @@ -146,7 +142,7 @@ if ($op eq 'add_form') { $sth->finish; $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'"); + 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; $sth2->finish; @@ -158,8 +154,6 @@ if ($op eq 'add_form') { enrolmentperiod => $data->{'enrolmentperiod'}, upperagelimit => $data->{'upperagelimit'}, dateofbirthrequired => $data->{'dateofbirthrequired'}, - finetype => $data->{'finetype'}, - bulk => $data->{'bulk'}, enrolmentfee => $data->{'enrolmentfee'}, overduenoticerequired => $data->{'overduenoticerequired'}, issuelimit => $data->{'issuelimit'}, @@ -190,8 +184,6 @@ if ($op eq 'add_form') { enrolmentperiod => $results->[$i]{'enrolmentperiod'}, upperagelimit => $results->[$i]{'upperagelimit'}, dateofbirthrequired => $results->[$i]{'dateofbirthrequired'}, - finetype => $results->[$i]{'finetype'}, - bulk => $results->[$i]{'bulk'}, enrolmentfee => $results->[$i]{'enrolmentfee'}, overduenoticerequired => $results->[$i]{'overduenoticerequired'}, issuelimit => $results->[$i]{'issuelimit'}, diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl index b8d5a9e758..82e3dd4498 100644 --- a/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/categorie.tmpl @@ -97,7 +97,7 @@ Enrollment period - > + > @@ -109,19 +109,7 @@ Age Required - > - - - - Fine type - - > - - - - Bulk - - > + size=3 maxlength=2> @@ -133,7 +121,10 @@ Overdue notice required - > + @@ -211,7 +202,7 @@ Overdue notice required - + YesNo Issue limit @@ -289,7 +280,7 @@ - + YesNo Edit diff --git a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl index e3f9b4276d..d776eba69a 100644 --- a/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl +++ b/koha-tmpl/intranet-tmpl/default/fr/parameters/categorie.tmpl @@ -96,7 +96,7 @@ Enrollment - > + > @@ -108,19 +108,7 @@ Age Minimum - > - - - - Profil - - > - - - - ?? - - > + size=3 maxlength=2> @@ -132,7 +120,10 @@ Dépassement - > + @@ -210,7 +201,7 @@ Dépassement - + OuiNon Nb maxi emprunts @@ -288,7 +279,7 @@ - + OuiNon Edit -- 2.39.5