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

Return to bug 15355