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

(-)a/C4/Circulation.pm (-8 / +8 lines)
Lines 353-369 sub transferbook { Link Here
353
            $dotransfer = 0;
353
            $dotransfer = 0;
354
            $messages->{'RecallPlacedAtHoldingBranch'} = 1;
354
            $messages->{'RecallPlacedAtHoldingBranch'} = 1;
355
        } else {
355
        } else {
356
            $dotransfer = 1;
356
            $dotransfer = 0;
357
        }
357
        }
358
    } else {  #recalls take priority over holds, only check holds if no recalls
358
#   } else {  #recalls take priority over holds, only check holds if no recalls
359
        # find reserves.....
359
        # find reserves.....
360
        my ( $resfound, $resrec, undef ) =
360
#       my ( $resfound, $resrec, undef ) =
361
            CheckReserves( $itemnumber );
361
#           CheckReserves( $itemnumber );
362
        if ( $resfound and not $ignoreRs ) {
362
#       if ( $resfound and not $ignoreRs ) {
363
            $resrec->{'ResFound'} = $resfound;
363
#           $resrec->{'ResFound'} = $resfound;
364
#         $messages->{'ResFound'} = $resrec;
364
#         $messages->{'ResFound'} = $resrec;
365
            $dotransfer = 1;
365
#           $dotransfer = 1;
366
        }
366
#       }
367
    }
367
    }
368
368
369
    #actually do the transfer....
369
    #actually do the transfer....
(-)a/circ/returns.pl (-2 / +10 lines)
Lines 484-497 if ( $messages->{'ResFound'}) { Link Here
484
484
485
if ( $messages->{'RecallFound'} ){
485
if ( $messages->{'RecallFound'} ){
486
    my $recall = $messages->{'Recall'};
486
    my $recall = $messages->{'Recall'};
487
warn $userenv_branch;
488
warn $recall->branchcode;
489
    my $transfer_recall;
490
    if ($userenv_branch  eq $recall->branchcode) {
491
        $transfer_recall = 0;
492
    } else {
493
        $transfer_recall = 1;
494
    }
487
    my $patron = Koha::Patrons->find( $recall->borrowernumber );
495
    my $patron = Koha::Patrons->find( $recall->borrowernumber );
488
    $template->param(
496
    $template->param(
489
        patron   => $patron,
497
        patron   => $patron,
490
        found    => 1,
498
        found    => 1,
491
        recalled => 1,
499
        recalled => 1,
492
        recall   => $recall,
500
        recall   => $recall,
493
        transfer_recall => ($userenv_branch eq $recall->branchcode ? 1 : 0 )
501
        transfer_recall => $transfer_recall,
494
#        address   => $patron->address,
502
        address   => $patron->address,
495
#        address2  => $patron->address2,
503
#        address2  => $patron->address2,
496
#        streetnumber => $patron->streetnumber,
504
#        streetnumber => $patron->streetnumber,
497
#        city         => $patron->city,
505
#        city         => $patron->city,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
Lines 921-927 Circulation: Link Here
921
    Recalls:
921
    Recalls:
922
        -
922
        -
923
            - pref: UseRecalls
923
            - pref: UseRecalls
924
             choices:
924
              choices:
925
                 yes: Use
925
                 yes: Use
926
                 no: "Don't use"
926
                 no: "Don't use"
927
            - recalls
927
            - recalls
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 lines)
Lines 203-209 Link Here
203
                                                                <span>Don't allow</span>
203
                                                                <span>Don't allow</span>
204
                                                            [% END %]
204
                                                            [% END %]
205
                                                        </td>
205
                                                        </td>
206
                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
207
                                                        <td>[% rule.recall_due_date_interval %]</td>
206
                                                        <td>[% rule.recall_due_date_interval %]</td>
208
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
207
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
209
                                                        <td>[% rule.recall_shelf_time %]</td>
208
                                                        <td>[% rule.recall_shelf_time %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+8 lines)
Lines 59-64 Link Here
59
                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
59
                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
60
                    </li>
60
                    </li>
61
                </ul>
61
                </ul>
62
                [% IF Koha.Preference('UseRecalls') %]
63
                  <h3>Recalls</h3>
64
                    <ul class="buttons-list">
65
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_queue.pl"><i class="fa fa-tasks"></i> Recalls queue</a></li>
66
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_overdue.pl"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
67
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_waiting.pl"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
68
                    </ul>
69
                [% END %]
62
            </div>
70
            </div>
63
71
64
            <!-- Add the extra clearfix for only the required viewport -->
72
            <!-- Add the extra clearfix for only the required viewport -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Asset %]
1
[% USE Koha %]
2
[% USE Koha %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 5-11 Link Here
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
<style type="text/css"> p { margin-top: 0; }</style>
7
<style type="text/css"> p { margin-top: 0; }</style>
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
9
[% Asset.js("js/recalls.js") %]
9
[% INCLUDE 'datatables.inc' %]
10
[% INCLUDE 'datatables.inc' %]
10
[% INCLUDE 'columns_settings.inc' %]
11
[% INCLUDE 'columns_settings.inc' %]
11
</head>
12
</head>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Asset %]
1
[% USE Koha %]
2
[% USE Koha %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
Lines 57-63 Link Here
57
[% MACRO jsinclude BLOCK %]
58
[% MACRO jsinclude BLOCK %]
58
    [% INCLUDE 'datatables.inc' %]
59
    [% INCLUDE 'datatables.inc' %]
59
    [% INCLUDE 'columns_settings.inc' %]
60
    [% INCLUDE 'columns_settings.inc' %]
60
    <script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
61
    [% Asset.js("js/recalls.js") %]
61
    <script type="text/javascript">
62
    <script type="text/javascript">
62
    $(document).ready(function() {
63
    $(document).ready(function() {
63
            $(".old").hide();
64
            $(".old").hide();
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-1 / +2 lines)
Lines 1-3 Link Here
1
[% USE Asset %]
1
[% USE Koha %]
2
[% USE Koha %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 5-11 Link Here
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
<style type="text/css"> p { margin-top: 0; }</style>
7
<style type="text/css"> p { margin-top: 0; }</style>
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
8
<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
9
[% Asset.js("js/recalls.js") %]
9
[% INCLUDE 'datatables.inc' %]
10
[% INCLUDE 'datatables.inc' %]
10
<script type="text/javascript">
11
<script type="text/javascript">
11
    $(document).ready(function() {
12
    $(document).ready(function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 lines)
Lines 506-512 Link Here
506
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
506
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
507
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
507
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
508
                    <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
508
                    <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
509
                    <input type="hidden" name="transfer_recall" value="[% recall.branchcode %]" />
510
                </div>
509
                </div>
511
510
512
                <div class="modal-footer">
511
                <div class="modal-footer">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 627-633 Link Here
627
                                </li>
627
                                </li>
628
                            [% END %]
628
                            [% END %]
629
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
629
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
630
                                <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
630
                                <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
631
                            [% END %]
631
                            [% END %]
632
                            [% IF Koha.Preference('ArticleRequests') %]
632
                            [% IF Koha.Preference('ArticleRequests') %]
633
                                <li>
633
                                <li>
Lines 745-751 Link Here
745
                                [% END %]
745
                                [% END %]
746
                            </div> [% # /div#reserves %]
746
                            </div> [% # /div#reserves %]
747
                        [% END %]
747
                        [% END %]
748
                        [% IF Koha.Preferernce('UseRecalls') && recalls.count %]
748
                        [% IF Koha.Preference('UseRecalls') && recalls.count %]
749
                            [% INCLUDE 'recalls.inc' %]
749
                            [% INCLUDE 'recalls.inc' %]
750
                        [% END %]
750
                        [% END %]
751
751
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-2 / +2 lines)
Lines 1-3 Link Here
1
[% USE Asset %]
1
[% USE KohaDates %]
2
[% USE KohaDates %]
2
[% USE Koha %]
3
[% USE Koha %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
Lines 5-11 Link Here
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
7
[% INCLUDE 'datatables.inc' %]
8
[% INCLUDE 'datatables.inc' %]
8
<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>
9
[% Asset.js("js/recalls.js") %]
9
</head>
10
</head>
10
<body id="recalls_history" class="pat">
11
<body id="recalls_history" class="pat">
11
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'header.inc' %]
12
- 

Return to bug 19532