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 513-526 if ( $messages->{'ResFound'}) { Link Here
513
513
514
if ( $messages->{'RecallFound'} ){
514
if ( $messages->{'RecallFound'} ){
515
    my $recall = $messages->{'Recall'};
515
    my $recall = $messages->{'Recall'};
516
warn $userenv_branch;
517
warn $recall->branchcode;
518
    my $transfer_recall;
519
    if ($userenv_branch  eq $recall->branchcode) {
520
        $transfer_recall = 0;
521
    } else {
522
        $transfer_recall = 1;
523
    }
516
    my $patron = Koha::Patrons->find( $recall->borrowernumber );
524
    my $patron = Koha::Patrons->find( $recall->borrowernumber );
517
    $template->param(
525
    $template->param(
518
        patron   => $patron,
526
        patron   => $patron,
519
        found    => 1,
527
        found    => 1,
520
        recalled => 1,
528
        recalled => 1,
521
        recall   => $recall,
529
        recall   => $recall,
522
        transfer_recall => ($userenv_branch eq $recall->branchcode ? 1 : 0 )
530
        transfer_recall => $transfer_recall,
523
#        address   => $patron->address,
531
        address   => $patron->address,
524
#        address2  => $patron->address2,
532
#        address2  => $patron->address2,
525
#        streetnumber => $patron->streetnumber,
533
#        streetnumber => $patron->streetnumber,
526
#        city         => $patron->city,
534
#        city         => $patron->city,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
Lines 953-959 Circulation: Link Here
953
    Recalls:
953
    Recalls:
954
        -
954
        -
955
            - pref: UseRecalls
955
            - pref: UseRecalls
956
             choices:
956
              choices:
957
                 yes: Use
957
                 yes: Use
958
                 no: "Don't use"
958
                 no: "Don't use"
959
            - recalls
959
            - recalls
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 lines)
Lines 204-210 Link Here
204
                                                                <span>Don't allow</span>
204
                                                                <span>Don't allow</span>
205
                                                            [% END %]
205
                                                            [% END %]
206
                                                        </td>
206
                                                        </td>
207
                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
208
                                                        <td>[% rule.recall_due_date_interval %]</td>
207
                                                        <td>[% rule.recall_due_date_interval %]</td>
209
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
208
                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
210
                                                        <td>[% rule.recall_shelf_time %]</td>
209
                                                        <td>[% rule.recall_shelf_time %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+8 lines)
Lines 65-70 Link Here
65
                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
65
                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
66
                    </li>
66
                    </li>
67
                </ul>
67
                </ul>
68
                [% IF Koha.Preference('UseRecalls') %]
69
                  <h3>Recalls</h3>
70
                    <ul class="buttons-list">
71
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_queue.pl"><i class="fa fa-tasks"></i> Recalls queue</a></li>
72
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_overdue.pl"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
73
                      <li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_waiting.pl"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
74
                    </ul>
75
                [% END %]
68
            </div>
76
            </div>
69
77
70
            <!-- Add the extra clearfix for only the required viewport -->
78
            <!-- 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 558-564 Link Here
558
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
558
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
559
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
559
                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
560
                    <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
560
                    <input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
561
                    <input type="hidden" name="transfer_recall" value="[% recall.branchcode %]" />
562
                </div>
561
                </div>
563
562
564
                <div class="modal-footer">
563
                <div class="modal-footer">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 662-668 Link Here
662
                                </li>
662
                                </li>
663
                            [% END %]
663
                            [% END %]
664
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
664
                            [% IF Koha.Preference('UseRecalls') && recalls.count %]
665
                                <li><a href="#recalls" id+"recalls-tab">[% recalls.count %] Recall(s)</a></li>
665
                                <li><a href="#recalls" id="recalls-tab">[% recalls.count %] Recall(s)</a></li>
666
                            [% END %]
666
                            [% END %]
667
                            [% IF Koha.Preference('ArticleRequests') %]
667
                            [% IF Koha.Preference('ArticleRequests') %]
668
                                <li>
668
                                <li>
Lines 780-786 Link Here
780
                                [% END %]
780
                                [% END %]
781
                            </div> [% # /div#reserves %]
781
                            </div> [% # /div#reserves %]
782
                        [% END %]
782
                        [% END %]
783
                        [% IF Koha.Preferernce('UseRecalls') && recalls.count %]
783
                        [% IF Koha.Preference('UseRecalls') && recalls.count %]
784
                            [% INCLUDE 'recalls.inc' %]
784
                            [% INCLUDE 'recalls.inc' %]
785
                        [% END %]
785
                        [% END %]
786
786
(-)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