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

(-)a/circ/returns.pl (+2 lines)
Lines 280-285 if ($barcode) { Link Here
280
    $template->param(
280
    $template->param(
281
        title            => $biblio->{'title'},
281
        title            => $biblio->{'title'},
282
        homebranch       => $biblio->{'homebranch'},
282
        homebranch       => $biblio->{'homebranch'},
283
        holdingbranch    => $biblio->{'holdingbranch'},
283
        returnbranch     => $returnbranch,
284
        returnbranch     => $returnbranch,
284
        author           => $biblio->{'author'},
285
        author           => $biblio->{'author'},
285
        itembarcode      => $biblio->{'barcode'},
286
        itembarcode      => $biblio->{'barcode'},
Lines 373-378 if ( $messages->{'NeedsTransfer'} ){ Link Here
373
if ( $messages->{'Wrongbranch'} ){
374
if ( $messages->{'Wrongbranch'} ){
374
    $template->param(
375
    $template->param(
375
        wrongbranch => 1,
376
        wrongbranch => 1,
377
        rightbranch => $messages->{'Wrongbranch'}->{'Rightbranch'},
376
    );
378
    );
377
}
379
}
378
380
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-21 / +41 lines)
Lines 132-138 $(document).ready(function () { Link Here
132
[% END %]
132
[% END %]
133
133
134
[% IF ( collectionItemNeedsTransferred ) %]
134
[% IF ( collectionItemNeedsTransferred ) %]
135
 <div id="rotating-collection" class="dialog message">This item is part of a rotating collection and needs to be transferred to [% collectionBranch %]</div>
135
 <div id="rotating-collection" class="dialog message">
136
        <h3>Please transfer to: [% collectionBranch %]</h3>
137
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
138
            <p>This item is part of a rotating collection.</p>
139
</div>
136
[% END %]
140
[% END %]
137
141
138
<!-- Patron has fines -->
142
<!-- Patron has fines -->
Lines 164-174 $(document).ready(function () { Link Here
164
[% END %]
168
[% END %]
165
169
166
[% IF ( wrongbranch ) %]
170
[% IF ( wrongbranch ) %]
167
<div class="dialog alert"><h3>Cannot check in</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>
171
    <div class="dialog alert"><h3>Cannot check in</h3>
168
</div>
172
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
173
        </p><strong>NOT CHECKED IN</strong></p>
174
        <p>This item must be checked in at following library: <strong>[% Branches.GetName( rightbranch ) %]</strong></p>
175
    </div>
169
[% END %]
176
[% END %]
170
<!-- case of a mistake in transfer loop -->
177
<!-- case of a mistake in transfer loop -->
171
[% IF ( WrongTransfer ) %]<div id="return2" class="dialog message"><!-- WrongTransfer --><h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a> to [% Branches.GetName( TransferWaitingAt ) %]</h3><h3><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print slip</a> or <a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></h3>
178
[% IF ( WrongTransfer ) %]
179
    <div id="return2" class="dialog message">
180
        <!-- WrongTransfer -->
181
        <h3>Please return to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
182
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
183
        <ul><li><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print transfer slip</a></li><li><a href="/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1">Cancel transfer</a></li></ul>
172
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
184
[% IF ( wborcnum ) %]<h5>Hold for:</h5>
173
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
185
        <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
174
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
186
            [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
Lines 201-207 $(document).ready(function () { Link Here
201
	<!-- waiting -->
213
	<!-- waiting -->
202
214
203
    <div id="hold-found1" class="dialog message audio-alert-action">
215
    <div id="hold-found1" class="dialog message audio-alert-action">
204
        <h3>Hold found (item is already waiting):  <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
216
        <h3>Hold found (item is already waiting)</h3>
217
        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
205
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
218
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
206
        <h4>Hold for:</h4>
219
        <h4>Hold for:</h4>
207
			<ul>
220
			<ul>
Lines 249-255 $(document).ready(function () { Link Here
249
    [% IF ( diffbranch ) %]
262
    [% IF ( diffbranch ) %]
250
		<!-- diffbranch -->
263
		<!-- diffbranch -->
251
        <div id="transfer-needed" class="dialog message audio-alert-action">
264
        <div id="transfer-needed" class="dialog message audio-alert-action">
252
		<h3>Hold needing transfer found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
265
            <h3>Hold needing transfer found</h3>
266
                <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
253
                <h4>Hold for: </h4>
267
                <h4>Hold for: </h4>
254
                    <ul>
268
                    <ul>
255
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
269
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
Lines 293-299 $(document).ready(function () { Link Here
293
    [% IF ( transfer ) %]
307
    [% IF ( transfer ) %]
294
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
308
    <!-- transfer: item with no reservation, must be returned according to home library circulation rules -->
295
        <div id="return1" class="dialog message audio-alert-action">
309
        <div id="return1" class="dialog message audio-alert-action">
296
            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% Branches.GetName( returnbranch ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a> )</h3>
310
            <h3>Please return to: [% Branches.GetName( returnbranch ) %]</h3>
311
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
312
            <ul><li><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a> )</li></ul>
297
        </div>
313
        </div>
298
    [% END %]
314
    [% END %]
299
315
Lines 355-361 $(document).ready(function () { Link Here
355
	<!--  reserved  -->
371
	<!--  reserved  -->
356
372
357
    <div id="hold-found2" class="dialog message audio-alert-action">
373
    <div id="hold-found2" class="dialog message audio-alert-action">
358
      <h3>Hold found: <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% itembiblionumber %]">[% title |html %]</a></h3>
374
      <h3>Hold found</h3>
375
          <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
359
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
376
        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
360
        <h5>Hold for:</h5>
377
        <h5>Hold for:</h5>
361
		<ul>
378
		<ul>
Lines 407-427 $(document).ready(function () { Link Here
407
[% IF ( errmsgloop ) %]
424
[% IF ( errmsgloop ) %]
408
    <div class="dialog alert audio-alert-warning">
425
    <div class="dialog alert audio-alert-warning">
409
        <h3>Check in message</h3>
426
        <h3>Check in message</h3>
427
        [% IF itembiblionumber %]
428
            <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
429
        [% END %]
410
        [% FOREACH errmsgloo IN errmsgloop %]
430
        [% FOREACH errmsgloo IN errmsgloop %]
411
                    [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
431
                    [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
412
                        <p class="problem">
432
                        <p class="problem">
413
                            Not for loan status updated
433
                            Not for loan status updated.
414
                            from
434
                            <br />Old value:
415
                            [% IF errmsgloo.NotForLoanStatusUpdated.from %]
435
                            [% IF errmsgloo.NotForLoanStatusUpdated.from %]
416
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]
436
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %].
417
                            [% ELSE %]
437
                            [% ELSE %]
418
                                being available for loan
438
                                Available for loan.
419
                            [% END %]
439
                            [% END %]
420
                            to
440
                            <br />New value:
421
                            [% IF errmsgloo.NotForLoanStatusUpdated.to %]
441
                            [% IF errmsgloo.NotForLoanStatusUpdated.to %]
422
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]
442
                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %].
423
                            [% ELSE %]
443
                            [% ELSE %]
424
                                being available for loan
444
                                Available for loan.
425
                            [% END %]
445
                            [% END %]
426
                        </p>
446
                        </p>
427
                    [% END %]
447
                    [% END %]
Lines 442-466 $(document).ready(function () { Link Here
442
                        [% IF ( LostItemFeeRefunded ) %]
462
                        [% IF ( LostItemFeeRefunded ) %]
443
                            <p class="problem">A refund has been applied to the borrowing patron's account.</p>
463
                            <p class="problem">A refund has been applied to the borrowing patron's account.</p>
444
                        [% ELSE %]
464
                        [% ELSE %]
445
                            <p class="problem">Any lost item fees for this item will remain on the patron's account</p>
465
                            <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
446
                        [% END %]
466
                        [% END %]
447
                    [% END %]
467
                    [% END %]
448
                    [% IF ( errmsgloo.withdrawn ) %]
468
                    [% IF ( errmsgloo.withdrawn ) %]
449
                        [% IF BlockReturnOfWithdrawnItems %]
469
                        [% IF BlockReturnOfWithdrawnItems %]
450
                           <h5>Cannot check in</h5>
470
                           <h5>Cannot check in</h5>
451
                           <p class="problem">Item is withdrawn. <strong>NOT CHECKED IN</strong></p>
471
                           <p><strong>NOT CHECKED IN</strong></p>
472
                           <p class="problem">Item is withdrawn.</p>
452
                        [% ELSE %]
473
                        [% ELSE %]
453
                           <p class="problem">Item is withdrawn.</p>
474
                           <p class="problem">Item is withdrawn.</p>
454
                        [% END %]
475
                        [% END %]
455
                    [% END %]
476
                    [% END %]
456
                    [% IF ( errmsgloo.debarred ) %]
477
                    [% IF ( errmsgloo.debarred ) %]
457
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %] </p>
478
                        <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p>
458
                    [% END %]
479
                    [% END %]
459
                    [% IF ( errmsgloo.prevdebarred ) %]
480
                    [% IF ( errmsgloo.prevdebarred ) %]
460
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %]</p>
481
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
461
                    [% END %]
482
                    [% END %]
462
                    [% IF ( errmsgloo.foreverdebarred ) %]
483
                    [% IF ( errmsgloo.foreverdebarred ) %]
463
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction</p>
484
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
464
                    [% END %]
485
                    [% END %]
465
486
466
            [% END %]
487
            [% END %]
467
- 

Return to bug 15355