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

(-)a/circ/pendingreserves.pl (-30 / +31 lines)
Lines 163-193 if ( $run_report ) { Link Here
163
        push(
163
        push(
164
            @reservedata,
164
            @reservedata,
165
            {
165
            {
166
                reservedate      	=> format_date( $data->{l_reservedate} ),
166
                reservedate     => format_date( $data->{l_reservedate} ),
167
                priority         	=> $data->{priority},
167
                priority        => $data->{priority},
168
                name             	=> $data->{l_patron},
168
                name            => $data->{l_patron},
169
                title            	=> $data->{title},
169
                title           => $data->{title},
170
                author           	=> $data->{author},
170
                author          => $data->{author},
171
                borrowernumber   	=> $data->{borrowernumber},
171
                borrowernumber  => $data->{borrowernumber},
172
                itemnum          	=> $data->{itemnumber},
172
                itemnum         => $data->{itemnumber},
173
                phone            	=> $data->{phone},
173
                phone           => $data->{phone},
174
                email            	=> $data->{email},
174
                email           => $data->{email},
175
                biblionumber     	=> $data->{biblionumber},
175
                biblionumber    => $data->{biblionumber},
176
                statusw          	=> ( $data->{found} eq "W" ),
176
                statusw         => ( $data->{found} eq "W" ),
177
                statusf          	=> ( $data->{found} eq "F" ),
177
                statusf         => ( $data->{found} eq "F" ),
178
                holdingbranch    	=> $data->{l_holdingbranch},
178
                holdingbranch   => $data->{l_holdingbranch},
179
                branch           	=> $data->{l_branch},
179
                branch          => $data->{l_branch},
180
                itemcallnumber   	=> $data->{l_itemcallnumber},
180
                itemcallnumber  => $data->{l_itemcallnumber},
181
                enumchron        	=> $data->{l_enumchron},
181
                enumchron       => $data->{l_enumchron},
182
		copyno           	=> $data->{l_copynumber},
182
                copyno          => $data->{l_copynumber},
183
                notes            	=> $data->{notes},
183
                notes           => $data->{notes},
184
                notificationdate 	=> $data->{notificationdate},
184
                notificationdate=> $data->{notificationdate},
185
                reminderdate     	=> $data->{reminderdate},
185
                reminderdate    => $data->{reminderdate},
186
                count			=> $data->{icount},
186
                count           => $data->{icount},
187
                rcount			=> $data->{rcount},
187
                rcount          => $data->{rcount},
188
                pullcount		=> $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
188
                pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
189
                itype			=> $data->{l_itype},
189
                itype           => $data->{l_itype},
190
                location		=> $data->{l_location}
190
                location        => $data->{l_location},
191
            }
191
            }
192
        );
192
        );
193
    }
193
    }
Lines 195-208 if ( $run_report ) { Link Here
195
}
195
}
196
196
197
$template->param(
197
$template->param(
198
    todaysdate      	=> format_date($todaysdate),
198
    todaysdate          => format_date($todaysdate),
199
    from                => $startdate,
199
    from                => $startdate,
200
    to              	=> $enddate,
200
    to                  => $enddate,
201
    run_report          => $run_report,
201
    run_report          => $run_report,
202
    reserveloop     	=> \@reservedata,
202
    reserveloop         => \@reservedata,
203
    "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
203
    "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
204
    DHTMLcalendar_dateformat =>  C4::Dates->DHTMLcalendar(),
204
    DHTMLcalendar_dateformat    =>  C4::Dates->DHTMLcalendar(),
205
    dateformat    => C4::Context->preference("dateformat"),
205
    dateformat                  => C4::Context->preference("dateformat"),
206
    HoldsToPullStartDate        => (C4::Context->preference('HoldsToPullStartDate')?C4::Context->preference('HoldsToPullStartDate'):2),
206
);
207
);
207
208
208
output_html_with_http_headers $input, $cookie, $template->output;
209
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-3 / +2 lines)
Lines 153-159 $(document).ready(function() { Link Here
153
<input type="text" size="10" id="to" name="to" value="[% to %]" class="datepickerto" />
153
<input type="text" size="10" id="to" name="to" value="[% to %]" class="datepickerto" />
154
</li>
154
</li>
155
</ol>
155
</ol>
156
<p><i>(Inclusive, default is two days ago to today, set other date ranges as needed. )</i></p>
156
<p><i>(Inclusive, default is [% HoldsToPullStartDate %] days ago to today, set other date ranges as needed. )</i></p>
157
<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
157
<fieldset class="action"><input type="submit" name="run_report" value="Submit" class="submit"/></fieldset>
158
</fieldset>
158
</fieldset>
159
</form>
159
</form>
Lines 161-164 $(document).ready(function() { Link Here
161
</div>
161
</div>
162
</div>
162
</div>
163
</div>
163
</div>
164
[% INCLUDE 'intranet-bottom.inc' %]
164
[% INCLUDE 'intranet-bottom.inc' %]
165
- 

Return to bug 8585