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

(-)a/circ/pendingreserves.pl (-1 / +7 lines)
Lines 134-146 if ( $run_report ) { Link Here
134
            GROUP_CONCAT(DISTINCT reserves.branchcode 
134
            GROUP_CONCAT(DISTINCT reserves.branchcode 
135
                    ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
135
                    ORDER BY items.itemnumber SEPARATOR ', ') l_branch,
136
            items.holdingbranch as branch,
136
            items.holdingbranch as branch,
137
            items.itemcallnumber,
138
            GROUP_CONCAT(DISTINCT items.itype 
137
            GROUP_CONCAT(DISTINCT items.itype 
139
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
138
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itype,
140
            GROUP_CONCAT(DISTINCT items.location 
139
            GROUP_CONCAT(DISTINCT items.location 
141
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
140
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_location,
142
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
141
            GROUP_CONCAT(DISTINCT items.itemcallnumber 
143
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
142
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
143
            GROUP_CONCAT(DISTINCT items.enumchron
144
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
145
            GROUP_CONCAT(DISTINCT items.copynumber
146
                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
144
            items.itemnumber,
147
            items.itemnumber,
145
            notes,
148
            notes,
146
            notificationdate,
149
            notificationdate,
Lines 159-164 if ( $run_report ) { Link Here
159
    WHERE
162
    WHERE
160
    reserves.found IS NULL
163
    reserves.found IS NULL
161
    $sqldatewhere
164
    $sqldatewhere
165
    AND (reserves.itemnumber IS NULL OR reserves.itemnumber = items.itemnumber)
162
    AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
166
    AND items.itemnumber NOT IN (SELECT itemnumber FROM branchtransfers where datearrived IS NULL)
163
    AND issues.itemnumber IS NULL
167
    AND issues.itemnumber IS NULL
164
    AND reserves.priority <> 0 
168
    AND reserves.priority <> 0 
Lines 200-205 if ( $run_report ) { Link Here
200
                holdingbranch    => $data->{l_holdingbranch},
204
                holdingbranch    => $data->{l_holdingbranch},
201
                branch           => $data->{l_branch},
205
                branch           => $data->{l_branch},
202
                itemcallnumber   => $data->{l_itemcallnumber},
206
                itemcallnumber   => $data->{l_itemcallnumber},
207
                enumchron        => $data->{l_enumchron},
208
		copyno           => $data->{l_copynumber},
203
                notes            => $data->{notes},
209
                notes            => $data->{notes},
204
                notificationdate => $data->{notificationdate},
210
                notificationdate => $data->{notificationdate},
205
                reminderdate     => $data->{reminderdate},
211
                reminderdate     => $data->{reminderdate},
(-)a/circ/view_holdsqueue.pl (-1 / +1 lines)
Lines 81-87 sub GetHoldsQueueItems { Link Here
81
	my $dbh = C4::Context->dbh;
81
	my $dbh = C4::Context->dbh;
82
82
83
    my @bind_params = ();
83
    my @bind_params = ();
84
	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn
84
	my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
85
                  FROM tmp_holdsqueue
85
                  FROM tmp_holdsqueue
86
                       JOIN biblio      USING (biblionumber)
86
                       JOIN biblio      USING (biblionumber)
87
				  LEFT JOIN biblioitems USING (biblionumber)
87
				  LEFT JOIN biblioitems USING (biblionumber)
(-)a/circ/waitingreserves.pl (+2 lines)
Lines 129-134 foreach my $num (@getreserves) { Link Here
129
    $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
129
    $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
130
    $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
130
    $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
131
    $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
131
    $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
132
    $getreserv{'enumchron'}      = $gettitle->{'enumchron'};
133
    $getreserv{'copynumber'}     = $gettitle->{'copynumber'};
132
    if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
134
    if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
133
        $getreserv{'dotransfer'} = 1;
135
        $getreserv{'dotransfer'} = 1;
134
    }
136
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (+8 lines)
Lines 72-77 $.tablesorter.addParser({ Link Here
72
				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
72
				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=call&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
73
        </th>
73
        </th>
74
        <th>
74
        <th>
75
            Available Copy No
76
        </th>
77
        <th>
78
            Available Enumeration
79
        </th>
80
        <th>
75
            Available Itypes
81
            Available Itypes
76
				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
82
				<a href="/cgi-bin/koha/circ/pendingreserves.pl?order=itype&amp;from=[% from %]&amp;to=[% to %]">Sort</a>
77
        </th>
83
        </th>
Lines 131-136 $.tablesorter.addParser({ Link Here
131
            [% END %]
137
            [% END %]
132
            <td><p>[% reserveloo.holdingbranch %]</p></td>
138
            <td><p>[% reserveloo.holdingbranch %]</p></td>
133
            <td><p>[% reserveloo.itemcallnumber %]</p></td>
139
            <td><p>[% reserveloo.itemcallnumber %]</p></td>
140
				<td><p>[% reserveloo.copyno %]</p></td>
141
        <td><p>[% reserveloo.enumchron %]</p></td>
134
				<td><p>[% reserveloo.itype %]</p></td> 
142
				<td><p>[% reserveloo.itype %]</p></td> 
135
				<td><p>[% reserveloo.location %]</p></td>
143
				<td><p>[% reserveloo.location %]</p></td>
136
            <td width="15%">
144
            <td width="15%">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +5 lines)
Lines 46-51 $(document).ready(function() { Link Here
46
        <th class="hq-title">Title</th>
46
        <th class="hq-title">Title</th>
47
        <th class="hq-collection">Collection</th>
47
        <th class="hq-collection">Collection</th>
48
        <th class="hq-callnumber">Call Number</th>
48
        <th class="hq-callnumber">Call Number</th>
49
        <th class="hq-copynumber">Copy Number</th>
50
        <th class="hq-enumchron">Enumeration</th>
49
        <th class="hq-barcode">Barcode</th>
51
        <th class="hq-barcode">Barcode</th>
50
        <th class="hq-patron">Patron</th>
52
        <th class="hq-patron">Patron</th>
51
        <th class="hq-sendto">Send To</th>
53
        <th class="hq-sendto">Send To</th>
Lines 65-71 $(document).ready(function() { Link Here
65
			</div>
67
			</div>
66
			</td>
68
			</td>
67
            <td class="hq-collection">[% itemsloo.ccode %]</td>
69
            <td class="hq-collection">[% itemsloo.ccode %]</td>
68
            <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %] [% itemsloo.enumchron %]</td>
70
            <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %]</td>
71
            <td class="hq-copynumber">[% itemsloo.copynumber %]</td>
72
            <td class="hq-enumchron">[% itemsloo.enumchron %]</td>
69
            <td class="hq-barcode">
73
            <td class="hq-barcode">
70
                [% IF ( itemsloo.item_level_request ) %]
74
                [% IF ( itemsloo.item_level_request ) %]
71
			<em>Only Item:</em> <strong>[% itemsloo.barcode %]</strong>
75
			<em>Only Item:</em> <strong>[% itemsloo.barcode %]</strong>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +8 lines)
Lines 79-84 $.tablesorter.addParser({ Link Here
79
                    <th>Title</th>
79
                    <th>Title</th>
80
                    <th>Patron</th>
80
                    <th>Patron</th>
81
                    <th>Location</th>
81
                    <th>Location</th>
82
                    <th>Copy Number</th>
83
                    <th>Enumeration</th>
82
                    <th>Action</th>
84
                    <th>Action</th>
83
               </tr></thead>
85
               </tr></thead>
84
               <tbody>[% FOREACH reserveloo IN reserveloop %]
86
               <tbody>[% FOREACH reserveloo IN reserveloop %]
Lines 95-100 $.tablesorter.addParser({ Link Here
95
                        [% reserveloo.borrowermail %]</a>[% END %]
97
                        [% reserveloo.borrowermail %]</a>[% END %]
96
                    </td>
98
                    </td>
97
                    <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td>
99
                    <td>[% reserveloo.homebranch %]<br />[% reserveloo.itemcallnumber %]</td>
100
                    <td>[% reserveloo.copynumber %]</td>
101
                    <td>[% reserveloo.enumchron %]</td>
98
                    <td>
102
                    <td>
99
                        <form name="cancelReserve" action="waitingreserves.pl" method="post">
103
                        <form name="cancelReserve" action="waitingreserves.pl" method="post">
100
                            <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" />
104
                            <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernum %]" />
Lines 124-129 $.tablesorter.addParser({ Link Here
124
                    <th>Title</th>
128
                    <th>Title</th>
125
                    <th>Patron</th>
129
                    <th>Patron</th>
126
                    <th>Location</th>
130
                    <th>Location</th>
131
                    <th>Copy Number</th>
132
                    <th>Enumeration</th>
127
                    <th>Action</th>
133
                    <th>Action</th>
128
               </tr></thead>
134
               </tr></thead>
129
               <tbody>[% FOREACH overloo IN overloop %]
135
               <tbody>[% FOREACH overloo IN overloop %]
Lines 139-144 $.tablesorter.addParser({ Link Here
139
        [% overloo.borrowermail %]</a>[% END %]
145
        [% overloo.borrowermail %]</a>[% END %]
140
                    </td>
146
                    </td>
141
                    <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td>
147
                    <td>[% overloo.homebranch %] [% overloo.itemcallnumber %]</td>
148
                    <td>[% overloo.copynumber %]</td>
149
                    <td>[% overloo.enumchron %]</td>
142
                    <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
150
                    <td><form name="cancelReserve" action="waitingreserves.pl" method="post">
143
                            <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" />
151
                            <input type="hidden" name="borrowernumber" value="[% overloo.borrowernum %]" />
144
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
152
                            <input type="hidden" name="itemnumber" value="[% overloo.itemnumber %]" />
145
- 

Return to bug 7201