View | Details | Raw Unified | Return to bug 5547
Collapse All | Expand All

(-)a/C4/Members.pm (+21 lines)
Lines 69-74 BEGIN { Link Here
69
    &PutPatronImage
69
    &PutPatronImage
70
    &RmPatronImage
70
    &RmPatronImage
71
71
72
                &GetHideLostItemsPreference
73
72
		&IsMemberBlocked
74
		&IsMemberBlocked
73
		&GetMemberAccountRecords
75
		&GetMemberAccountRecords
74
		&GetBorNotifyAcctRecord
76
		&GetBorNotifyAcctRecord
Lines 1806-1811 sub RmPatronImage { Link Here
1806
    return $dberror;
1808
    return $dberror;
1807
}
1809
}
1808
1810
1811
=head2 GetHideLostItemsPreference
1812
1813
  $hidelostitemspref = &GetHideLostItemsPreference($borrowernumber);
1814
1815
Returns the HideLostItems preference for the patron category of the supplied borrowernumber
1816
C<&$hidelostitemspref>return value of function, 0 or 1
1817
1818
=cut
1819
1820
sub GetHideLostItemsPreference {
1821
    my ($borrowernumber) = @_;
1822
    my $dbh = C4::Context->dbh;
1823
    my $query = "SELECT hidelostitems FROM borrowers,categories WHERE borrowers.categorycode = categories.categorycode AND borrowernumber = ?";
1824
    my $sth = $dbh->prepare($query);
1825
    $sth->execute($borrowernumber);
1826
    my $hidelostitems = $sth->fetchrow;    
1827
    return $hidelostitems;    
1828
}
1829
1809
=head2 GetRoadTypeDetails (OUEST-PROVENCE)
1830
=head2 GetRoadTypeDetails (OUEST-PROVENCE)
1810
1831
1811
  ($roadtype) = &GetRoadTypeDetails($roadtypeid);
1832
  ($roadtype) = &GetRoadTypeDetails($roadtypeid);
(-)a/C4/Search.pm (-1 / +3 lines)
Lines 25-30 use Lingua::Stem; Link Here
25
use C4::Search::PazPar2;
25
use C4::Search::PazPar2;
26
use XML::Simple;
26
use XML::Simple;
27
use C4::Dates qw(format_date);
27
use C4::Dates qw(format_date);
28
use C4::Members qw(GetHideLostItemsPreference);
28
use C4::XSLT;
29
use C4::XSLT;
29
use C4::Branch;
30
use C4::Branch;
30
use C4::Reserves;    # CheckReserves
31
use C4::Reserves;    # CheckReserves
Lines 1569-1575 sub searchResults { Link Here
1569
1570
1570
			my $prefix = $item->{$hbranch} . '--' . $item->{location} . $item->{itype} . $item->{itemcallnumber};
1571
			my $prefix = $item->{$hbranch} . '--' . $item->{location} . $item->{itype} . $item->{itemcallnumber};
1571
# For each grouping of items (onloan, available, unavailable), we build a key to store relevant info about that item
1572
# For each grouping of items (onloan, available, unavailable), we build a key to store relevant info about that item
1572
            if ( $item->{onloan} ) {
1573
            my $userenv = C4::Context->userenv;
1574
            if ( $item->{onloan} && !(C4::Members::GetHideLostItemsPreference($userenv->{'number'}) && $item->{itemlost}) ) {
1573
                $onloan_count++;
1575
                $onloan_count++;
1574
				my $key = $prefix . $item->{onloan} . $item->{barcode};
1576
				my $key = $prefix . $item->{onloan} . $item->{barcode};
1575
				$onloan_items->{$key}->{due_date} = format_date($item->{onloan});
1577
				$onloan_items->{$key}->{due_date} = format_date($item->{onloan});
(-)a/admin/categorie.pl (-6 / +9 lines)
Lines 92-98 if ($op eq 'add_form') { Link Here
92
	my $data;
92
	my $data;
93
	if ($categorycode) {
93
	if ($categorycode) {
94
		my $dbh = C4::Context->dbh;
94
		my $dbh = C4::Context->dbh;
95
		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
95
		my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?");
96
		$sth->execute($categorycode);
96
		$sth->execute($categorycode);
97
		$data=$sth->fetchrow_hashref;
97
		$data=$sth->fetchrow_hashref;
98
		$sth->finish;
98
		$sth->finish;
Lines 109-114 if ($op eq 'add_form') { Link Here
109
				overduenoticerequired   => $data->{'overduenoticerequired'},
109
				overduenoticerequired   => $data->{'overduenoticerequired'},
110
				issuelimit              => $data->{'issuelimit'},
110
				issuelimit              => $data->{'issuelimit'},
111
				reservefee              => sprintf("%.2f",$data->{'reservefee'}),
111
				reservefee              => sprintf("%.2f",$data->{'reservefee'}),
112
                                hidelostitems           => $data->{'hidelostitems'},
112
				category_type           => $data->{'category_type'},
113
				category_type           => $data->{'category_type'},
113
				DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
114
				DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
114
				"type_".$data->{'category_type'} => 1,
115
				"type_".$data->{'category_type'} => 1,
Lines 128-139 if ($op eq 'add_form') { Link Here
128
	}
129
	}
129
	
130
	
130
	if ($is_a_modif) {
131
	if ($is_a_modif) {
131
            my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
132
            my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
132
            $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type','categorycode'));
133
            $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode'));
133
            $sth->finish;
134
            $sth->finish;
134
        } else {
135
        } else {
135
            my $sth=$dbh->prepare("INSERT INTO categories  (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?)");
136
            my $sth=$dbh->prepare("INSERT INTO categories  (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?)");
136
            $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
137
            $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type'));
137
            $sth->finish;
138
            $sth->finish;
138
        }
139
        }
139
    if (C4::Context->preference('EnhancedMessagingPreferences')) {
140
    if (C4::Context->preference('EnhancedMessagingPreferences')) {
Lines 156-162 if ($op eq 'add_form') { Link Here
156
	$sth->finish;
157
	$sth->finish;
157
	$template->param(total => $total->{'total'});
158
	$template->param(total => $total->{'total'});
158
	
159
	
159
	my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,overduenoticerequired,category_type from categories where categorycode=?");
160
	my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?");
160
	$sth2->execute($categorycode);
161
	$sth2->execute($categorycode);
161
	my $data=$sth2->fetchrow_hashref;
162
	my $data=$sth2->fetchrow_hashref;
162
	$sth2->finish;
163
	$sth2->finish;
Lines 173-178 if ($op eq 'add_form') { Link Here
173
                                overduenoticerequired   => $data->{'overduenoticerequired'},
174
                                overduenoticerequired   => $data->{'overduenoticerequired'},
174
                                issuelimit              => $data->{'issuelimit'},
175
                                issuelimit              => $data->{'issuelimit'},
175
                                reservefee              =>  sprintf("%.2f",$data->{'reservefee'}),
176
                                reservefee              =>  sprintf("%.2f",$data->{'reservefee'}),
177
                                hidelostitems           => $data->{'hidelostitems'},
176
                                category_type           => $data->{'category_type'},
178
                                category_type           => $data->{'category_type'},
177
                                );
179
                                );
178
													# END $OP eq DELETE_CONFIRM
180
													# END $OP eq DELETE_CONFIRM
Lines 205-210 if ($op eq 'add_form') { Link Here
205
				overduenoticerequired   => $results->[$i]{'overduenoticerequired'},
207
				overduenoticerequired   => $results->[$i]{'overduenoticerequired'},
206
				issuelimit              => $results->[$i]{'issuelimit'},
208
				issuelimit              => $results->[$i]{'issuelimit'},
207
				reservefee              => sprintf("%.2f",$results->[$i]{'reservefee'}),
209
				reservefee              => sprintf("%.2f",$results->[$i]{'reservefee'}),
210
                                hidelostitems           => $results->[$i]{'hidelostitems'},
208
				category_type           => $results->[$i]{'category_type'},
211
				category_type           => $results->[$i]{'category_type'},
209
				"type_".$results->[$i]{'category_type'} => 1);
212
				"type_".$results->[$i]{'category_type'} => 1);
210
        if (C4::Context->preference('EnhancedMessagingPreferences')) {
213
        if (C4::Context->preference('EnhancedMessagingPreferences')) {
(-)a/catalogue/detail.pl (-3 / +13 lines)
Lines 64-69 if($query->cookie("holdfor")){ Link Here
64
my $biblionumber = $query->param('biblionumber');
64
my $biblionumber = $query->param('biblionumber');
65
my $fw = GetFrameworkCode($biblionumber);
65
my $fw = GetFrameworkCode($biblionumber);
66
66
67
my $showallitems = $query->param('showallitems');
68
67
## get notes and subjects from MARC record
69
## get notes and subjects from MARC record
68
my $marcflavour      = C4::Context->preference("marcflavour");
70
my $marcflavour      = C4::Context->preference("marcflavour");
69
my $record           = GetMarcBiblio($biblionumber);
71
my $record           = GetMarcBiblio($biblionumber);
Lines 109-116 my $branches = GetBranches(); Link Here
109
my $itemtypes = GetItemTypes();
111
my $itemtypes = GetItemTypes();
110
my $dbh = C4::Context->dbh;
112
my $dbh = C4::Context->dbh;
111
113
112
# change back when ive fixed request.pl
114
# 'intra' param included, even though it's not respected in GetItemsInfo currently
113
my @items = &GetItemsInfo( $biblionumber, 'intra' );
115
my @all_items= GetItemsInfo($biblionumber, 'intra');
116
my @items;
117
for my $itm (@all_items) {
118
    push @items, $itm unless ( $itm->{itemlost} && GetHideLostItemsPreference($borrowernumber) && !$showallitems);
119
}
114
my $dat = &GetBiblioData($biblionumber);
120
my $dat = &GetBiblioData($biblionumber);
115
121
116
# get count of holds
122
# get count of holds
Lines 141-147 foreach my $subscription (@subscriptions) { Link Here
141
if ( defined $dat->{'itemtype'} ) {
147
if ( defined $dat->{'itemtype'} ) {
142
    $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
148
    $dat->{imageurl} = getitemtypeimagelocation( 'intranet', $itemtypes->{ $dat->{itemtype} }{imageurl} );
143
}
149
}
144
$dat->{'count'} = scalar @items;
150
151
$dat->{'count'} = scalar @all_items;
152
$dat->{'showncount'} = scalar @items;
153
$dat->{'hiddencount'} = scalar @all_items - scalar @items;
154
145
my $shelflocations = GetKohaAuthorisedValues('items.location', $fw);
155
my $shelflocations = GetKohaAuthorisedValues('items.location', $fw);
146
my $collections    = GetKohaAuthorisedValues('items.ccode'   , $fw);
156
my $collections    = GetKohaAuthorisedValues('items.ccode'   , $fw);
147
my (@itemloop, %itemfields);
157
my (@itemloop, %itemfields);
(-)a/catalogue/moredetail.pl (-5 / +19 lines)
Lines 33-38 use C4::Dates qw/format_date/; Link Here
33
use C4::Circulation;  # to use itemissues
33
use C4::Circulation;  # to use itemissues
34
use C4::Members; # to use GetMember
34
use C4::Members; # to use GetMember
35
use C4::Search;		# enabled_staff_search_views
35
use C4::Search;		# enabled_staff_search_views
36
use C4::Members qw/GetHideLostItemsPreference/;
36
37
37
my $query=new CGI;
38
my $query=new CGI;
38
39
Lines 65-72 my $biblionumber=$query->param('biblionumber'); Link Here
65
my $title=$query->param('title');
66
my $title=$query->param('title');
66
my $bi=$query->param('bi');
67
my $bi=$query->param('bi');
67
$bi = $biblionumber unless $bi;
68
$bi = $biblionumber unless $bi;
69
my $itemnumber = $query->param('itemnumber');
68
my $data=GetBiblioData($biblionumber);
70
my $data=GetBiblioData($biblionumber);
69
my $dewey = $data->{'dewey'};
71
my $dewey = $data->{'dewey'};
72
my $showallitems = $query->param('showallitems');
70
73
71
#coping with subscriptions
74
#coping with subscriptions
72
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
75
my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber);
Lines 84-99 my $subscriptionsnumber = CountSubscriptionFromBiblionumber($biblionumber); Link Here
84
87
85
my @results;
88
my @results;
86
my $fw = GetFrameworkCode($biblionumber);
89
my $fw = GetFrameworkCode($biblionumber);
87
my @items= GetItemsInfo($biblionumber);
90
my @all_items= GetItemsInfo($biblionumber);
88
my $count=@items;
91
my @items;
89
$data->{'count'}=$count;
92
for my $itm (@all_items) {
93
    push @items, $itm unless ( $itm->{itemlost} && 
94
                               GetHideLostItemsPreference($loggedinuser) &&
95
                               !$showallitems && 
96
                               ($itemnumber != $itm->{itemnumber}));
97
}
98
99
my $totalcount=@all_items;
100
my $showncount=@items;
101
my $hiddencount = $totalcount - $showncount;
102
$data->{'count'}=$totalcount;
103
$data->{'showncount'}=$showncount;
104
$data->{'hiddencount'}=$hiddencount;  # can be zero
90
105
91
my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw);
106
my $ccodes= GetKohaAuthorisedValues('items.ccode',$fw);
92
my $itemtypes = GetItemTypes;
107
my $itemtypes = GetItemTypes;
93
108
94
$data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'};
109
$data->{'itemtypename'} = $itemtypes->{$data->{'itemtype'}}->{'description'};
95
$results[0]=$data;
110
$results[0]=$data;
96
my $itemnumber;
97
($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
111
($itemnumber) and @items = (grep {$_->{'itemnumber'} == $itemnumber} @items);
98
foreach my $item (@items){
112
foreach my $item (@items){
99
    $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
113
    $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
Lines 143-149 $template->param(loggedinuser => $loggedinuser); Link Here
143
$template->param(biblionumber => $biblionumber);
157
$template->param(biblionumber => $biblionumber);
144
$template->param(biblioitemnumber => $bi);
158
$template->param(biblioitemnumber => $bi);
145
$template->param(itemnumber => $itemnumber);
159
$template->param(itemnumber => $itemnumber);
146
$template->param(ONLY_ONE => 1) if ( $itemnumber && $count != @items );
160
$template->param(ONLY_ONE => 1) if ( $itemnumber && $showncount != @items );
147
$template->param(z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)));
161
$template->param(z3950_search_params => C4::Search::z3950_search_args(GetBiblioData($biblionumber)));
148
162
149
output_html_with_http_headers $query, $cookie, $template->output;
163
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 420-425 CREATE TABLE `categories` ( Link Here
420
  `overduenoticerequired` tinyint(1) default NULL,
420
  `overduenoticerequired` tinyint(1) default NULL,
421
  `issuelimit` smallint(6) default NULL,
421
  `issuelimit` smallint(6) default NULL,
422
  `reservefee` decimal(28,6) default NULL,
422
  `reservefee` decimal(28,6) default NULL,
423
  `hidelostitems` tinyint(1) NOT NULL default '0' 
423
  `category_type` varchar(1) NOT NULL default 'A',
424
  `category_type` varchar(1) NOT NULL default 'A',
424
  PRIMARY KEY  (`categorycode`),
425
  PRIMARY KEY  (`categorycode`),
425
  UNIQUE KEY `categorycode` (`categorycode`)
426
  UNIQUE KEY `categorycode` (`categorycode`)
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4090-4095 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4090
    SetVersion ($DBversion);
4090
    SetVersion ($DBversion);
4091
}
4091
}
4092
4092
4093
$DBversion = '3.03.00.XXX';
4094
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4095
    $dbh->do("ALTER TABLE `categories` ADD `hidelostitems` tinyint(1) NOT NULL default '0' AFTER `reservefee`");
4096
    print "Upgrade to $DBversion done (Add hidelostitems preference to borrower categories)\n";
4097
    SetVersion ($DBversion);
4098
}
4099
4093
=head1 FUNCTIONS
4100
=head1 FUNCTIONS
4094
4101
4095
=head2 DropAllForeignKeys($table)
4102
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl (+12 lines)
Lines 151-156 Link Here
151
						<option value="1">Yes</option>
151
						<option value="1">Yes</option>
152
			<!-- /TMPL_IF -->
152
			<!-- /TMPL_IF -->
153
					</select></li>
153
					</select></li>
154
	<li><label for="hidelostitems">Lost items in staff client</label> &nbsp; <select name="hidelostitems" id="hidelostitems">
155
			<!-- TMPL_IF NAME="hidelostitems" -->
156
						<option value="0">Shown</option>
157
						<option value="1" selected="selected">Hidden by default</option>
158
			<!-- TMPL_ELSE -->
159
						<option value="0" selected="selected">Shown</option>
160
						<option value="1">Hidden by default</option>
161
			<!-- /TMPL_IF -->
162
					</select></li>
154
	<li><label for="reservefee">Hold fee: </label><input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
163
	<li><label for="reservefee">Hold fee: </label><input type="text" name="reservefee" id="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></li>
155
	<li><label for="category_type">Category type: </label> &nbsp; <select name="category_type" id="category_type">
164
	<li><label for="category_type">Category type: </label> &nbsp; <select name="category_type" id="category_type">
156
						<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
165
						<!-- TMPL_IF NAME="type_n" --><option value="" selected="selected">Select a Category type</option><!-- TMPL_ELSE --><option value="">Select a Category type</option><!-- /TMPL_IF -->
Lines 208-213 Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" escape="html" --> Link Here
208
	<tr><th scope="row">Upperage limit: </th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
217
	<tr><th scope="row">Upperage limit: </th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
209
	<tr><th scope="row">Enrollment fee: </th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
218
	<tr><th scope="row">Enrollment fee: </th><td><!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
210
	<tr><th scope="row">Receives overdue notices: </th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
219
	<tr><th scope="row">Receives overdue notices: </th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
220
	<tr><th scope="row">Lost items in staff client</th><td><!-- TMPL_IF NAME="hidelostitems" -->Hidden by default<!-- TMPL_ELSE -->Shown<!-- /TMPL_IF --></td></tr>
211
	<tr><th scope="row">Hold fee: </th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
221
	<tr><th scope="row">Hold fee: </th><td><!-- TMPL_VAR NAME="reservefee" --></td></tr>
212
</table>
222
</table>
213
		<fieldset class="action"><!-- TMPL_IF NAME="totalgtzero" -->
223
		<fieldset class="action"><!-- TMPL_IF NAME="totalgtzero" -->
Lines 282-287 Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" escape="html" --> Link Here
282
			<th scope="col">Upper age limit</th>
292
			<th scope="col">Upper age limit</th>
283
			<th scope="col">Enrollment fee</th>
293
			<th scope="col">Enrollment fee</th>
284
			<th scope="col">Overdue</th>
294
			<th scope="col">Overdue</th>
295
			<th scope="col">Lost Items</th>
285
 			<th scope="col">Hold fee</th>
296
 			<th scope="col">Hold fee</th>
286
            <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
297
            <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
287
            <th scope="col">Messaging</th>
298
            <th scope="col">Messaging</th>
Lines 318-323 Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" escape="html" --> Link Here
318
			<td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
329
			<td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
319
                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
330
                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
320
                        <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
331
                        <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
332
                        <td><!-- TMPL_IF NAME="hidelostitems" -->Hidden<!-- TMPL_ELSE -->Shown<!-- /TMPL_IF --></td>
321
                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
333
                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
322
                        <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
334
                        <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
323
                        <td>
335
                        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl (-1 / +6 lines)
Lines 217-222 function verify_images() { Link Here
217
217
218
<div id="holdings">
218
<div id="holdings">
219
<!-- TMPL_IF name="count" -->
219
<!-- TMPL_IF name="count" -->
220
    <!-- TMPL_IF name="showncount" -->
220
        <table>
221
        <table>
221
            <tr>
222
            <tr>
222
                <!-- TMPL_IF NAME="item_level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
223
                <!-- TMPL_IF NAME="item_level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
Lines 364-369 function verify_images() { Link Here
364
                </tr>
365
                </tr>
365
            <!-- /TMPL_LOOP -->
366
            <!-- /TMPL_LOOP -->
366
        </table>
367
        </table>
368
        <!-- /TMPL_IF -->
369
                <!-- TMPL_IF NAME="hiddencount" -->
370
                   <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&showallitems=1">Show all items (<!-- TMPL_VAR NAME="hiddencount" --> hidden)</a>
371
                <!-- /TMPL_IF --> 		
367
		<!-- TMPL_IF NAME="debug_display" -->
372
		<!-- TMPL_IF NAME="debug_display" -->
368
		<br /><br />
373
		<br /><br />
369
		<table>
374
		<table>
Lines 371-377 function verify_images() { Link Here
371
			<tr><td>itemdata_copynumber</td><td><!-- TMPL_VAR NAME="itemdata_copynumber" --></td></tr>
376
			<tr><td>itemdata_copynumber</td><td><!-- TMPL_VAR NAME="itemdata_copynumber" --></td></tr>
372
			<tr><td>serial</td><td><!-- TMPL_VAR NAME="serial" --></td></tr>
377
			<tr><td>serial</td><td><!-- TMPL_VAR NAME="serial" --></td></tr>
373
		</table>
378
		</table>
374
		<!-- /TMPL_IF -->
379
                <!-- /TMPL_IF -->
375
<!-- TMPL_ELSE -->
380
<!-- TMPL_ELSE -->
376
    <p>No physical items for this record</p>
381
    <p>No physical items for this record</p>
377
<!-- /TMPL_IF -->
382
<!-- /TMPL_IF -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl (-1 / +2 lines)
Lines 32-38 Link Here
32
        <!-- TMPL_IF NAME="volumeddesc" --><li><span class="label">Volume:</span> <!-- TMPL_VAR NAME="volumeddesc" --></li><!-- /TMPL_IF -->
32
        <!-- TMPL_IF NAME="volumeddesc" --><li><span class="label">Volume:</span> <!-- TMPL_VAR NAME="volumeddesc" --></li><!-- /TMPL_IF -->
33
        <li><span class="label">Physical Details:</span> <!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" -->&nbsp;</li>
33
        <li><span class="label">Physical Details:</span> <!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" -->&nbsp;</li>
34
        <!-- TMPL_IF NAME="bnotes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR NAME="bnotes" --></li><!-- /TMPL_IF -->
34
        <!-- TMPL_IF NAME="bnotes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR NAME="bnotes" --></li><!-- /TMPL_IF -->
35
        <li><span class="label">No. of Items:</span> <!-- TMPL_VAR NAME="count" -->&nbsp;</li>
35
        <li><span class="label">No. of Items:</span> <!-- TMPL_VAR NAME="count" -->&nbsp;<!-- TMPL_IF NAME="hiddencount" -->total (<!-- TMPL_VAR NAME="showncount" --> shown / <!-- TMPL_VAR NAME="hiddencount" --> hidden) 
36
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&showallitems=1">Show all items</a><!-- /TMPL_IF --></li>
36
    </ol>
37
    </ol>
37
    <!-- /TMPL_LOOP -->
38
    <!-- /TMPL_LOOP -->
38
    <br clear="all" />
39
    <br clear="all" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl (-1 / +7 lines)
Lines 391-396 function checkMultiHold() { Link Here
391
            <th>Information</th>
391
            <th>Information</th>
392
        </tr>
392
        </tr>
393
    <!-- TMPL_LOOP Name="itemloop" -->
393
    <!-- TMPL_LOOP Name="itemloop" -->
394
        <!-- TMPL_UNLESS NAME="hide"-->
394
        <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
395
        <tr class="<!-- TMPL_VAR NAME="backgroundcolor" -->">
395
            <td>
396
            <td>
396
            <!-- TMPL_IF NAME="available" -->
397
            <!-- TMPL_IF NAME="available" -->
Lines 458-466 function checkMultiHold() { Link Here
458
            <!-- /TMPL_IF -->
459
            <!-- /TMPL_IF -->
459
            </td>
460
            </td>
460
        </tr>
461
        </tr>
462
      <!-- /TMPL_UNLESS --> <!--UNLESS item hide-->
461
    <!-- /TMPL_LOOP --> <!-- itemloop -->
463
    <!-- /TMPL_LOOP --> <!-- itemloop -->
462
        </table>
464
        </table>
463
465
    <!-- TMPL_IF NAME=hiddencount -->
466
        <form>
467
        <p class="hiddencount"><a href="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber"-->&cardnumber=<!-- TMPL_VAR NAME="cardnumber" -->&showallitems=1">Show all items (<!--TMPL_VAR NAME="hiddencount" --> hidden)</a></p>
468
        </form>
469
    <!-- /TMPL_IF --> <!-- hiddencount -->
464
    <!-- /TMPL_LOOP --> <!-- bibitemloop -->
470
    <!-- /TMPL_LOOP --> <!-- bibitemloop -->
465
471
466
  <!-- TMPL_ELSE --><!-- UNLESS multi_hold -->
472
  <!-- TMPL_ELSE --><!-- UNLESS multi_hold -->
(-)a/reserve/request.pl (-2 / +8 lines)
Lines 57-62 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
57
57
58
my $multihold = $input->param('multi_hold');
58
my $multihold = $input->param('multi_hold');
59
$template->param(multi_hold => $multihold);
59
$template->param(multi_hold => $multihold);
60
my $showallitems = $input->param('showallitems');
60
61
61
# get Branches and Itemtypes
62
# get Branches and Itemtypes
62
my $branches = GetBranches();
63
my $branches = GetBranches();
Lines 319-324 foreach my $biblionumber (@biblionumbers) { Link Here
319
        my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
320
        my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
320
        my $num_available = 0;
321
        my $num_available = 0;
321
        my $num_override  = 0;
322
        my $num_override  = 0;
323
        my $hiddencount   = 0;
322
        
324
        
323
        $biblioitem->{description} =
325
        $biblioitem->{description} =
324
          $itemtypes->{ $biblioitem->{itemtype} }{description};
326
          $itemtypes->{ $biblioitem->{itemtype} }{description};
Lines 376-382 foreach my $biblionumber (@biblionumbers) { Link Here
376
                $item->{notforloanvalue} =
378
                $item->{notforloanvalue} =
377
                  $notforloan_label_of->{ $item->{notforloan} };
379
                  $notforloan_label_of->{ $item->{notforloan} };
378
            }
380
            }
379
            
381
     
380
            # Management of lost or long overdue items
382
            # Management of lost or long overdue items
381
            if ( $item->{itemlost} ) {
383
            if ( $item->{itemlost} ) {
382
                
384
                
Lines 386-391 foreach my $biblionumber (@biblionumbers) { Link Here
386
                    : $item->{itemlost} == 2 ? "(long overdue)"
388
                    : $item->{itemlost} == 2 ? "(long overdue)"
387
                      : "";
389
                      : "";
388
                $item->{backgroundcolor} = 'other';
390
                $item->{backgroundcolor} = 'other';
391
                if (GetHideLostItemsPreference($borrowernumber) && !$showallitems) {
392
                    $item->{hide} = 1;
393
                    $hiddencount++;
394
                }
389
            }
395
            }
390
            
396
            
391
            # Check the transit status
397
            # Check the transit status
Lines 458-463 foreach my $biblionumber (@biblionumbers) { Link Here
458
            $biblioloopiter{warn} = 1;
464
            $biblioloopiter{warn} = 1;
459
            $biblioloopiter{none_avail} = 1;
465
            $biblioloopiter{none_avail} = 1;
460
        }
466
        }
467
        $template->param( hiddencount => $hiddencount);
461
        
468
        
462
        push @bibitemloop, $biblioitem;
469
        push @bibitemloop, $biblioitem;
463
    }
470
    }
464
- 

Return to bug 5547