Attachment #81228 for bug #19532

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




            $dotransfer = 0;
            $messages->{'RecallPlacedAtHoldingBranch'} = 1;
        } else {
            $dotransfer = 0;
        }
    } else {  #recalls take priority over holds, only check holds if no recalls
        # find reserves.....
#       my ( $resfound, $resrec, undef ) =
#       CheckReserves( $itemnumber );
#        if ( $resfound and not $ignoreRs ) {
#            $resrec->{'ResFound'} = $resfound;
#            $messages->{'ResFound'} = $resrec;
#            $dotransfer = 1;
#        }
    }

    #actually do the transfer....





if ( $messages->{'RecallFound'} ){
    my $recall = $messages->{'Recall'};
    warn $userenv_branch;
    warn $recall->branchcode;
    my $transfer_recall;
    if ($userenv_branch  eq $recall->branchcode) {
        $transfer_recall = 0;
    } else {
        $transfer_recall = 1;
    }
    my $patron = Koha::Patrons->find( $recall->borrowernumber );
    $template->param(
        patron   => $patron,
        found    => 1,
        recalled => 1,
        recall   => $recall,
        transfer_recall => $transfer_recall,
        address   => $patron->address,
#       address2  => $patron->address2,
#       streetnumber => $patron->streetnumber,
#       city         => $patron->city,

Lines 214-220 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 lines)
214	<span>Don't allow</span>	214	<span>Don't allow</span>
215	[% END %]	215	[% END %]
216	</td>	216	</td>
217	<td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
218	<td>[% rule.recall_due_date_interval %]</td>	217	<td>[% rule.recall_due_date_interval %]</td>
219	<td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>	218	<td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
220	<td>[% rule.recall_shelf_time %]</td>	219	<td>[% rule.recall_shelf_time %]</td>

Lines 70-75 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+8 lines)
70	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>	70	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
71	</li>	71	</li>
72	</ul>	72	</ul>
		73	[% IF Koha.Preference('UseRecalls') %]
		74	<h3>Recalls</h3>
		75	<ul class="buttons-list">
		76	<li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_queue.pl"><i class="fa fa-tasks"></i> Recalls queue</a></li>
		77	<li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_overdue.pl"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
		78	<li><a class="circ-button" href="/cgi-bin/koha/circ/recalls_waiting.pl"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
		79	</ul>
		80	[% END %]
73	</div>	81	</div>
74		82
75	<!-- Add the extra clearfix for only the required viewport -->	83	<!-- Add the extra clearfix for only the required viewport -->

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-1 / +2 lines)
		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>

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt (-1 / +2 lines)
		1	[% USE Asset %]
1	[% USE Koha %]	2	[% USE Koha %]
2	[% USE KohaDates %]	3	[% USE KohaDates %]
3	[% SET footerjs = 1 %]	4	[% SET footerjs = 1 %]
Lines 58-64 Link Here
58	[% MACRO jsinclude BLOCK %]	59	[% MACRO jsinclude BLOCK %]
59	[% INCLUDE 'datatables.inc' %]	60	[% INCLUDE 'datatables.inc' %]
60	[% INCLUDE 'columns_settings.inc' %]	61	[% INCLUDE 'columns_settings.inc' %]
61	<script type="text/javascript" src="[% interface %]/[% theme %]/js/recalls_[% KOHA_VERSION %].js"></script>	62	[% Asset.js("js/recalls.js") %]
62	<script type="text/javascript">	63	<script type="text/javascript">
63	$(document).ready(function() {	64	$(document).ready(function() {
64	$(".old").hide();	65	$(".old").hide();

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-1 / +2 lines)
		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() {

Lines 559-565 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 lines)
559	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />	559	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
560	<input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />	560	<input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
561	<input type="hidden" name="recall_id" value="[% recall.recall_id %]" />	561	<input type="hidden" name="recall_id" value="[% recall.recall_id %]" />
562	<input type="hidden" name="transfer_recall" value="[% recall.branchcode %]" />
563	</div>	562	</div>
564		563
565	<div class="modal-footer">	564	<div class="modal-footer">

Lines 662-668 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
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

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-2 / +2 lines)
		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

Lines 353-368 sub transferbook { Link Here

(-)a/C4/Circulation.pm (-7 / +8 lines)
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 ) = CheckReserves( $itemnumber );	360	# my ( $resfound, $resrec, undef ) =
361	if ( $resfound and not $ignoreRs ) {	361	# CheckReserves( $itemnumber );
362	$resrec->{'ResFound'} = $resfound;	362	# if ( $resfound and not $ignoreRs ) {
363	# $messages->{'ResFound'} = $resrec;	363	# $resrec->{'ResFound'} = $resfound;
364	$dotransfer = 1;	364	# $messages->{'ResFound'} = $resrec;
365	}	365	# $dotransfer = 1;
		366	# }
366	}	367	}
367		368
368	#actually do the transfer....	369	#actually do the transfer....

Lines 513-526 if ( $messages->{'ResFound'}) { Link Here

(-)a/circ/returns.pl (-2 / +10 lines)
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,