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

(-)a/circ/pendingreserves.pl (-1 lines)
Lines 252-258 $sth->execute(@query_params); Link Here
252
while ( my $data = $sth->fetchrow_hashref ) {
252
while ( my $data = $sth->fetchrow_hashref ) {
253
    push(
253
    push(
254
        @reservedata, {
254
        @reservedata, {
255
<<<<<<< HEAD
256
            reservedate      => $data->{l_reservedate},
255
            reservedate      => $data->{l_reservedate},
257
            firstname        => $data->{firstname} || '',
256
            firstname        => $data->{firstname} || '',
258
            surname          => $data->{surname},
257
            surname          => $data->{surname},
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 944-950 Link Here
944
    [% INCLUDE 'str/members-menu.inc' %]
944
    [% INCLUDE 'str/members-menu.inc' %]
945
    [% Asset.js("js/members-menu.js") | $raw %]
945
    [% Asset.js("js/members-menu.js") | $raw %]
946
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
946
    [% Asset.js("js/messaging-preference-form.js") | $raw %]
947
    [% Asset.js("js/hold-group.js") %]
947
    [% Asset.js("js/hold-group.js") | $raw %]
948
    <script>
948
    <script>
949
949
950
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
950
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
(-)a/reserve/placerequest.pl (-1 / +1 lines)
Lines 78-84 my $found; Link Here
78
if ( $type eq 'str8' && $borrower ) {
78
if ( $type eq 'str8' && $borrower ) {
79
79
80
    my $hold_group_id;
80
    my $hold_group_id;
81
    if ($multi_hold && $requestany) {
81
    if ((@biblionumbers > 1) && $requestany) {
82
        $hold_group_id = AddHoldGroup();
82
        $hold_group_id = AddHoldGroup();
83
    }
83
    }
84
84
(-)a/t/db_dependent/Reserves/HoldCount.t (-11 / +10 lines)
Lines 2-19 Link Here
2
2
3
# This file is part of Koha.
3
# This file is part of Koha.
4
#
4
#
5
# Koha is free software; you can redistribute it and/or modify it under the
5
# Koha is free software; you can redistribute it and/or modify it
6
# terms of the GNU General Public License as published by the Free Software
6
# under the terms of the GNU General Public License as published by
7
# Foundation; either version 3 of the License, or (at your option) any later
7
# the Free Software Foundation; either version 3 of the License, or
8
# version.
8
# (at your option) any later version.
9
#
9
#
10
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
10
# Koha is distributed in the hope that it will be useful, but
11
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
11
# WITHOUT ANY WARRANTY; without even the implied warranty of
12
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
13
#
14
#
14
# You should have received a copy of the GNU General Public License along
15
# You should have received a copy of the GNU General Public License
15
# with Koha; if not, write to the Free Software Foundation, Inc.,
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
16
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
- 

Return to bug 15516