From 9da0386a546517e7904c2f1d119511946774ceb8 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Mon, 23 Nov 2009 09:39:12 +0100 Subject: [PATCH] (bug #3801) fix itemtype administration This delete all code related to renewals allowed in itemtype administration. --- admin/itemtypes.pl | 11 +++-------- .../prog/en/modules/admin/itemtypes.tmpl | 13 ------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl index 9f0395cdbc..4e6fc5ffb8 100755 --- a/admin/itemtypes.pl +++ b/admin/itemtypes.pl @@ -112,7 +112,6 @@ if ( $op eq 'add_form' ) { $template->param( itemtype => $itemtype, description => $data->{'description'}, - renewalsallowed => $data->{'renewalsallowed'}, rentalcharge => sprintf( "%.2f", $data->{'rentalcharge'} ), notforloan => $data->{'notforloan'}, imageurl => $data->{'imageurl'}, @@ -138,7 +137,6 @@ elsif ( $op eq 'add_validate' ) { my $query2 = ' UPDATE itemtypes SET description = ? - , renewalsallowed = ? , rentalcharge = ? , notforloan = ? , imageurl = ? @@ -148,7 +146,6 @@ elsif ( $op eq 'add_validate' ) { $sth = $dbh->prepare($query2); $sth->execute( $input->param('description'), - $input->param('renewalsallowed'), $input->param('rentalcharge'), ( $input->param('notforloan') ? 1 : 0 ), ( @@ -165,16 +162,15 @@ elsif ( $op eq 'add_validate' ) { else { # add a new itemtype & not modif an old my $query = " INSERT INTO itemtypes - (itemtype,description,renewalsallowed,rentalcharge, notforloan, imageurl,summary) + (itemtype,description,rentalcharge, notforloan, imageurl,summary) VALUES - (?,?,?,?,?,?,?); + (?,?,?,?,?,?); "; my $sth = $dbh->prepare($query); my $image = $input->param('image'); $sth->execute( $input->param('itemtype'), $input->param('description'), - $input->param('renewalsallowed'), $input->param('rentalcharge'), $input->param('notforloan') ? 1 : 0, $image eq 'removeImage' ? '' : @@ -204,14 +200,13 @@ elsif ( $op eq 'delete_confirm' ) { my $sth = $dbh->prepare( -"select itemtype,description,renewalsallowed,rentalcharge from itemtypes where itemtype=?" +"select itemtype,description,rentalcharge from itemtypes where itemtype=?" ); $sth->execute($itemtype); my $data = $sth->fetchrow_hashref; $template->param( itemtype => $itemtype, description => $data->{description}, - renewalsallowed => $data->{renewalsallowed}, rentalcharge => sprintf( "%.2f", $data->{rentalcharge} ), imageurl => $data->{imageurl}, total => $total diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl index a519c0ee64..4c34695486 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl @@ -224,10 +224,6 @@ Item Types Administration (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item) -
  • - - " /> -
  • " /> @@ -263,7 +259,6 @@ Item Types Administration Description Loan length - RenewalsAllowedNot allowed Rental charge
    " method="post"> " /> @@ -285,7 +280,6 @@ Item Types Administration Code Description Not for loan - Renewable Charge Actions @@ -304,13 +298,6 @@ Item Types Administration Yes  - - times - - No - - - -- 2.39.5