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

(-)a/circ/pendingreserves.pl (-4 / +4 lines)
Lines 97-103 if ( $run_report ) { Link Here
97 
    "SELECT min(reservedate) as l_reservedate,
 97 
    "SELECT min(reservedate) as l_reservedate,
98 
            reserves.borrowernumber as borrowernumber,
 98 
            reserves.borrowernumber as borrowernumber,
99 
            GROUP_CONCAT(DISTINCT items.holdingbranch
99 
            GROUP_CONCAT(DISTINCT items.holdingbranch
100 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_holdingbranch,
 100 
                    ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
101 
            reserves.biblionumber,
 101 
            reserves.biblionumber,
102 
            reserves.branchcode,
 102 
            reserves.branchcode,
103 
            GROUP_CONCAT(DISTINCT reserves.branchcode
103 
            GROUP_CONCAT(DISTINCT reserves.branchcode
Lines 106-112 if ( $run_report ) { Link Here
106 
            GROUP_CONCAT(DISTINCT items.itype
106 
            GROUP_CONCAT(DISTINCT items.itype
107 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
 107 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
108 
            GROUP_CONCAT(DISTINCT items.location
108 
            GROUP_CONCAT(DISTINCT items.location
109 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
 109 
                    ORDER BY items.itemnumber SEPARATOR '|') l_location,
110 
            GROUP_CONCAT(DISTINCT items.itemcallnumber
110 
            GROUP_CONCAT(DISTINCT items.itemcallnumber
111 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
 111 
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
112 
            GROUP_CONCAT(DISTINCT items.enumchron
 112 
            GROUP_CONCAT(DISTINCT items.enumchron
Lines 167-173 if ( $run_report ) { Link Here
167 
                biblionumber    => $data->{biblionumber},
 167 
                biblionumber    => $data->{biblionumber},
168 
                statusw         => ( $data->{found} eq "W" ),
 168 
                statusw         => ( $data->{found} eq "W" ),
169 
                statusf         => ( $data->{found} eq "F" ),
 169 
                statusf         => ( $data->{found} eq "F" ),
170 
                holdingbranch   => $data->{l_holdingbranch},
 170 
                holdingbranches => [split('\|', $data->{l_holdingbranch})],,
171 
                branch          => $data->{l_branch},
 171 
                branch          => $data->{l_branch},
172 
                itemcallnumber  => $data->{l_itemcallnumber},
 172 
                itemcallnumber  => $data->{l_itemcallnumber},
173 
                enumchron       => $data->{l_enumchron},
 173 
                enumchron       => $data->{l_enumchron},
Lines 178-184 if ( $run_report ) { Link Here
178 
                rcount          => $data->{rcount},
 178 
                rcount          => $data->{rcount},
179 
                pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
 179 
                pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
180 
                itype           => $data->{l_itype},
 180 
                itype           => $data->{l_itype},
181 
                location        => $data->{l_location},
 181 
                locations       => [split('\|', $data->{l_location})],
182 
            }
 182 
            }
183 
        );
 183 
        );
184 
    }
 184 
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-3 / +10 lines)
Lines 126-137 $(document).ready(function() { Link Here
126 
            <td>"</td>
 126 
            <td>"</td>
127 
            <td>"</td>
 127 
            <td>"</td>
128 
        [% END %]
 128 
        [% END %]
129 
        <td>[% Branches.GetName ( reserveloo.holdingbranch ) %]</td>
 129 
        <td>
130 
            [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
131 
                [% Branches.GetName ( holdingbranch ) %]<br>
132 
            [% END %]
133 
        </td>
130 
        <td><p>[% reserveloo.itemcallnumber %]</p></td>
 134 
        <td><p>[% reserveloo.itemcallnumber %]</p></td>
131 
        <td><p>[% reserveloo.copyno %]</p></td>
 135 
        <td><p>[% reserveloo.copyno %]</p></td>
132 
        <td><p>[% reserveloo.enumchron %]</p></td>
 136 
        <td><p>[% reserveloo.enumchron %]</p></td>
133 
        <td>[% ItemTypes.GetDescription( reserveloo.itype ) %]</td>
 137 
        <td>[% ItemTypes.GetDescription( reserveloo.itype ) %]</td>
134 
        <td>[% AuthorisedValues.GetByCode('LOC', reserveloo.location) %]</td>
 138 
        <td>
139 
        [% FOREACH loc IN reserveloo.locations %]
140 
            [% AuthorisedValues.GetByCode('LOC', loc) %]<br>
141 
        [% END %]
142 
        </td>
135 
        <td>
 143 
        <td>
136 
            <span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>
 144 
            <span title="[% reserveloo.reservedate %]">[% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]</span>
137 
            [% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]
 145 
            [% IF ( reserveloo.statusw ) %]<p>Waiting</p>[% END %][% IF ( reserveloo.statusf ) %]<p>Fullfilled</p>[% END %]
138 
-

Return to bug 15560