Attachment #59807 for bug #16530

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

Lines 27-32 use C4::Biblio; Link Here

(-)a/circ/branchoverdues.pl (-1 / +8 lines)
27	use C4::Koha;	27	use C4::Koha;
28	use C4::Debug;	28	use C4::Debug;
29	use Koha::DateUtils;	29	use Koha::DateUtils;
		30	use Koha::BiblioFrameworks;
30	use Data::Dumper;	31	use Data::Dumper;
31		32
32	=head1 branchoverdues.pl	33	=head1 branchoverdues.pl
Lines 61-67 use Data::Dumper; Link Here
61	my $input = new CGI;	62	my $input = new CGI;
62	my $dbh = C4::Context->dbh;	63	my $dbh = C4::Context->dbh;
63		64
64	my ( $template, $loggedinuser, $cookie ) = get_template_and_user({	65	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({
65	template_name => "circ/branchoverdues.tt",	66	template_name => "circ/branchoverdues.tt",
66	query => $input,	67	query => $input,
67	type => "intranet",	68	type => "intranet",
Lines 155-158 $template->param( Link Here
155	location => $location,	156	location => $location,
156	);	157	);
157		158
		159	# Checking if there is a Fast Cataloging Framework
		160	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		161
		162	# Checking if the transfer page needs to be displayed
		163	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		164
158	output_html_with_http_headers $input, $cookie, $template->output;	165	output_html_with_http_headers $input, $cookie, $template->output;

Lines 31-37 use C4::Items; Link Here

(-)a/circ/branchtransfers.pl (-2 / +9 lines)
31	use C4::Auth qw/:DEFAULT get_session/;	31	use C4::Auth qw/:DEFAULT get_session/;
32	use C4::Koha;	32	use C4::Koha;
33	use C4::Members;	33	use C4::Members;
34		34	use Koha::BiblioFrameworks;
35	use Koha::AuthorisedValues;	35	use Koha::AuthorisedValues;
36		36
37	###############################################	37	###############################################
Lines 52-58 if (!C4::Context->userenv){ Link Here
52		52
53	#######################################################################################	53	#######################################################################################
54	# Make the page .....	54	# Make the page .....
55	my ($template, $user, $cookie) = get_template_and_user(	55	my ($template, $user, $cookie, $flags ) = get_template_and_user(
56	{	56	{
57	template_name => "circ/branchtransfers.tt",	57	template_name => "circ/branchtransfers.tt",
58	query => $query,	58	query => $query,
Lines 236-240 $template->param( Link Here
236	errmsgloop => \@errmsgloop,	236	errmsgloop => \@errmsgloop,
237	CircAutocompl => C4::Context->preference("CircAutocompl")	237	CircAutocompl => C4::Context->preference("CircAutocompl")
238	);	238	);
		239
		240	# Checking if there is a Fast Cataloging Framework
		241	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		242
		243	# Checking if the transfer page needs to be displayed
		244	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		245
239	output_html_with_http_headers $query, $cookie, $template->output;	246	output_html_with_http_headers $query, $cookie, $template->output;
240		247

Lines 21-30 use Modern::Perl; Link Here

(-)a/circ/on-site_checkouts.pl (-1 / +9 lines)
21	use C4::Auth;	21	use C4::Auth;
22	use C4::Circulation qw( GetPendingOnSiteCheckouts );	22	use C4::Circulation qw( GetPendingOnSiteCheckouts );
23	use C4::Output;	23	use C4::Output;
		24	use C4::Koha;
		25	use Koha::BiblioFrameworks;
24		26
25	my $cgi = new CGI;	27	my $cgi = new CGI;
26		28
27	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	29	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
28	{	30	{
29	template_name => "circ/on-site_checkouts.tt",	31	template_name => "circ/on-site_checkouts.tt",
30	query => $cgi,	32	query => $cgi,
Lines 34-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
34	}	36	}
35	);	37	);
36		38
		39	# Checking if there is a Fast Cataloging Framework
		40	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		41
		42	# Checking if the transfer page needs to be displayed
		43	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		44
37	my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();	45	my $pending_onsite_checkouts = C4::Circulation::GetPendingOnSiteCheckouts();
38		46
39	$template->param(	47	$template->param(




use C4::Auth qw/:DEFAULT get_session/;
use C4::Output;
use C4::Circulation;
use C4::Koha;
use Koha::DateUtils;
use Koha::Database;
use Koha::BiblioFrameworks;

my $cgi = new CGI;

my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
    {
        template_name   => "circ/renew.tt",
        query           => $cgi,

    );
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# Checking if the transfer page needs to be displayed
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );

output_html_with_http_headers( $cgi, $cookie, $template->output );




use Koha::DateUtils;
use Koha::Calendar;
use Koha::Checkouts;
use Koha::BiblioFrameworks;

my $query = new CGI;

#getting the template
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
    {
        template_name   => "circ/returns.tt",
        query           => $query,

    }
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# Checking if the transfer page needs to be displayed
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );

# actually print the page!
output_html_with_http_headers $query, $cookie, $template->output;




use C4::Auth qw/:DEFAULT get_session/;
use C4::Print;  # GetPrinters
use C4::Koha;
use Koha::BiblioFrameworks;
use Koha::Libraries;

# this will be the script that chooses branch and printer settings....

my $query = CGI->new();

my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
    template_name   => "circ/selectbranchprinter.tt",
    query           => $query,
    type            => "intranet",

    recycle_loop=> \@recycle_loop,
);

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# Checking if the transfer page needs to be displayed
$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) || (C4::Context->preference("IndependentBranches") == 0) );

output_html_with_http_headers $query, $cookie, $template->output;

Lines 24-30 use CGI qw ( -utf8 ); Link Here

(-)a/circ/transferstoreceive.pl (-2 / +9 lines)
24	use C4::Context;	24	use C4::Context;
25	use C4::Output;	25	use C4::Output;
26	use C4::Auth;	26	use C4::Auth;
27	use Koha::DateUtils;
28	use C4::Biblio;	27	use C4::Biblio;
29	use C4::Circulation;	28	use C4::Circulation;
30	use C4::Members;	29	use C4::Members;
Lines 37-47 use Date::Calc qw( Link Here
37	use C4::Koha;	36	use C4::Koha;
38	use C4::Reserves;	37	use C4::Reserves;
39	use Koha::Libraries;	38	use Koha::Libraries;
		39	use Koha::DateUtils;
		40	use Koha::BiblioFrameworks;
40		41
41	my $input = new CGI;	42	my $input = new CGI;
42	my $itemnumber = $input->param('itemnumber');	43	my $itemnumber = $input->param('itemnumber');
43		44
44	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	45	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
45	{	46	{
46	template_name => "circ/transferstoreceive.tt",	47	template_name => "circ/transferstoreceive.tt",
47	query => $input,	48	query => $input,
Lines 124-128 $template->param( Link Here
124	latetransfers => $latetransfers ? 1 : 0,	125	latetransfers => $latetransfers ? 1 : 0,
125	);	126	);
126		127
		128	# Checking if there is a Fast Cataloging Framework
		129	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		130
		131	# Checking if the transfer page needs to be displayed
		132	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		133
127	output_html_with_http_headers $input, $cookie, $template->output;	134	output_html_with_http_headers $input, $cookie, $template->output;
128		135

Lines 31-39 use C4::Biblio; Link Here

(-)a/circ/view_holdsqueue.pl (-1 / +8 lines)
31	use C4::Items;	31	use C4::Items;
32	use C4::Koha; # GetItemTypes	32	use C4::Koha; # GetItemTypes
33	use C4::HoldsQueue qw(GetHoldsQueueItems);	33	use C4::HoldsQueue qw(GetHoldsQueueItems);
		34	use Koha::BiblioFrameworks;
34		35
35	my $query = new CGI;	36	my $query = new CGI;
36	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	37	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
37	{	38	{
38	template_name => "circ/view_holdsqueue.tt",	39	template_name => "circ/view_holdsqueue.tt",
39	query => $query,	40	query => $query,
Lines 74-78 $template->param( Link Here
74	itemtypeloop => \@itemtypesloop,	75	itemtypeloop => \@itemtypesloop,
75	);	76	);
76		77
		78	# Checking if there is a Fast Cataloging Framework
		79	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		80
		81	# Checking if the transfer page needs to be displayed
		82	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		83
77	# writing the template	84	# writing the template
78	output_html_with_http_headers $query, $cookie, $template->output;	85	output_html_with_http_headers $query, $cookie, $template->output;

Lines 28-34 use C4::Circulation; Link Here

(-)a/circ/waitingreserves.pl (-2 / +9 lines)
28	use C4::Members;	28	use C4::Members;
29	use C4::Biblio;	29	use C4::Biblio;
30	use C4::Items;	30	use C4::Items;
31	use Koha::DateUtils;
32	use Date::Calc qw(	31	use Date::Calc qw(
33	Today	32	Today
34	Add_Delta_Days	33	Add_Delta_Days
Lines 36-41 use Date::Calc qw( Link Here
36	);	35	);
37	use C4::Reserves;	36	use C4::Reserves;
38	use C4::Koha;	37	use C4::Koha;
		38	use Koha::DateUtils;
		39	use Koha::BiblioFrameworks;
39		40
40	my $input = new CGI;	41	my $input = new CGI;
41		42
Lines 47-53 my $all_branches = $input->param('allbranches') \|\| ''; Link Here
47	my $cancelall = $input->param('cancelall');	48	my $cancelall = $input->param('cancelall');
48	my $tab = $input->param('tab');	49	my $tab = $input->param('tab');
49		50
50	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	51	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
51	{	52	{
52	template_name => "circ/waitingreserves.tt",	53	template_name => "circ/waitingreserves.tt",
53	query => $input,	54	query => $input,
Lines 163-168 $template->param( Link Here
163	tab => $tab,	164	tab => $tab,
164	);	165	);
165		166
		167	# Checking if there is a Fast Cataloging Framework
		168	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		169
		170	# Checking if the transfer page needs to be displayed
		171	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		172
166	if ($item && $tab eq 'holdsover' && !@cancel_result) {	173	if ($item && $tab eq 'holdsover' && !@cancel_result) {
167	print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");	174	print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover");
168	} elsif ($cancelall) {	175	} elsif ($cancelall) {

(-)a/installer/data/mysql/atomicupdate/bug_16530-add_CircSidebar_syspref.sql (+1 lines)

Line 0 Link Here

INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`, `type`) VALUES ('CircSidebar','0','','Activate or deactivate the navigation sidebar on all Circulation pages','YesNo');

Lines 102-107 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
102	('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),	102	('CircAutocompl','1',NULL,'If ON, autocompletion is enabled for the Circulation input','YesNo'),
103	('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),	103	('CircAutoPrintQuickSlip','qslip',NULL,'Choose what should happen when an empty barcode field is submitted in circulation: Display a print quick slip window, Display a print slip window or Clear the screen.','Choice'),
104	('CircControl','ItemHomeLibrary','PickupLibrary\|PatronLibrary\|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),	104	('CircControl','ItemHomeLibrary','PickupLibrary\|PatronLibrary\|ItemHomeLibrary','Specify the agency that controls the circulation and fines policy','Choice'),
		105	('CircSidebar','0',NULL,'Activate or deactivate the navigation sidebar on all Circulation pages','YesNo'),
105	('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),	106	('ClaimsBccCopy','0','','Bcc the ClaimAcquisition and ClaimIssues alerts','YesNo'),
106	('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),	107	('Coce','0', NULL, 'If on, enables cover retrieval from the configured Coce server', 'YesNo'),
107	('CoceHost', '', NULL, 'Coce server URL', 'Free'),	108	('CoceHost', '', NULL, 'Coce server URL', 'Free'),




<script type="text/javascript">//<![CDATA[
    $(document).ready(function() {
        var path = location.pathname.substring(1);
        var url = window.location.toString();
        var params = '';
        if ( url.match(/\?(.+)$/) ) {
            params = "?" + RegExp.$1;
        }
        $('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold');
    });
//]]>
</script>

<div id="navmenu">
    <div id="navmenulist">

        <ul>
            <li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li>
        </ul>

        <h5>Circulation</h5>
        <ul>
            <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
            <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
            <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
            [% IF ( display_transfer ) %]
                <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
            [% END %]
            [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
                <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
            [% END %][% END %]
            [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
                <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
            [% END %][% END %]
        </ul>

        <h5>Circulation reports</h5>
        <ul>
            <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
            <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li>
            <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li>
            <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
            <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li>
            [% IF ( CAN_user_circulate_overdues_report ) %]
                <li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
            [% END %]
            <li><a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a></li>
            [% IF Koha.Preference('OnSiteCheckouts') %]
                <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
            [% END %]
        </ul>

    </div>
</div>

Lines 2-7 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+6 lines)
2	# FIXME: printcirculationslips is also omitted. It _technically_ could work, but C4::Print is HLT specific and needs a little bit of refactoring.	2	# FIXME: printcirculationslips is also omitted. It _technically_ could work, but C4::Print is HLT specific and needs a little bit of refactoring.
3	Interface:	3	Interface:
4	-	4	-
		5	- pref: CircSidebar
		6	choices:
		7	yes: Activate
		8	no: Deactivate
		9	- the navigation sidebar on all Circulation pages.
		10	-
5	- pref: CircAutocompl	11	- pref: CircAutocompl
6	choices:	12	choices:
7	yes: Try	13	yes: Try




[% USE Branches %]
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Overdues at [% LoginBranchname %]</title>
[% INCLUDE 'doc-head-close.inc' %]


<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Overdues at [% LoginBranchname %]</div>

[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]

   <div id="bd">
	<div id="yui-main">
        [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
	<div class="yui-g">




</div>
</div>
[% IF Koha.Preference('CircSidebar') %]
</div>
<div class="yui-b noprint">
    [% INCLUDE 'circ-nav.inc' %]
</div>
[% END %]
</div>
[% INCLUDE 'intranet-bottom.inc' %]





<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers</div>

[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
   <div id="bd">
<div id="yui-main">
[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
[% IF ( found ) %]
   <div class="yui-g"> <h3>Reserve found</h3>
    <table>

	
	
[% END %]
</div>
[% IF Koha.Preference('CircSidebar') %]
<div class="yui-b noprint">
[% INCLUDE 'circ-nav.inc' %]
</div>
[% END %]
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]

Lines 1005-1016 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-4 / +16 lines)
1005	[% END %] <!-- borrowernumber and borrower-->	1005	[% END %] <!-- borrowernumber and borrower-->
1006	</div></div>	1006	</div></div>
1007	[% END %]	1007	[% END %]
1008		1008	[% IF Koha.Preference('CircSidebar') %]
		1009	[% UNLESS ( borrowers ) %]
		1010	[% IF not( borrowernumber and borrower ) %]
		1011	<div class="yui-b noprint">
		1012	[% INCLUDE 'circ-nav.inc' %]
		1013	</div>
		1014	[% END %]
		1015	[% END %]
		1016	[% END %]
1009	</div>	1017	</div>
1010	</div>	1018	</div>
1011	[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]<div class="yui-b">	1019	[% UNLESS ( borrowers ) %]
1012	[% INCLUDE 'circ-menu.inc' %]	1020	[% IF borrowernumber and borrower %]
1013	</div>[% END %][% END %]	1021	<div class="yui-b">
		1022	[% INCLUDE 'circ-menu.inc' %]
		1023	</div>
		1024	[% END %]
		1025	[% END %]
1014	</div>	1026	</div>
1015	<!-- Modal -->	1027	<!-- Modal -->
1016	<div id="barcodeSubmittedModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">	1028	<div id="barcodeSubmittedModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true">

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt (-1 / +2 lines)
		1	[% USE Koha %]
1	[% USE Branches %]	2	[% USE Branches %]
2	[% USE KohaDates %]	3	[% USE KohaDates %]
3	[% USE AuthorisedValues %]	4	[% USE AuthorisedValues %]
Lines 79-85 $(document).ready(function(){ Link Here
79	</div>	80	</div>
80	</div>	81	</div>
81	<div class="yui-b">	82	<div class="yui-b">
82	[% INCLUDE 'circ-menu.inc' %]	83	[% IF Koha.Preference('CircSidebar') %][% INCLUDE 'circ-nav.inc' %][% END %]
83	</div>	84	</div>
84	</div>	85	</div>
85	[% INCLUDE 'intranet-bottom.inc' %]	86	[% INCLUDE 'intranet-bottom.inc' %]





<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>

[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
    <div id="bd">
        <div id="yui-main">
            [% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
                [% IF error %]
                    <div class="dialog alert">
                        <h3>Cannot renew:</h3>

                        </p>
                    </div>
                [% END %]
            </div>

            <div class="yui-g">


            [% END %]

        </div>

    </div>

[% IF Koha.Preference('CircSidebar') %]
</div>

<div class="yui-b noprint">
    [% INCLUDE 'circ-nav.inc' %]
</div>
[% END %]
<div>

[% INCLUDE 'intranet-bottom.inc' %]





<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>

[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]

   <div id="bd">
	<div id="yui-main">

<div id="bd">
<div id="yui-main">
[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
<div class="yui-g">

[% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %]

                    [% END %]
                    [% IF ( errmsgloo.prevdebarred ) %]
                        <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
                    [% END %]
                    [% IF ( errmsgloo.foreverdebarred ) %]
                        <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
                    [% END %]

            [% END %]
            [% IF ( errmsgloo.badbarcode ) %]
                <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
            [% END %]
            [% IF ( errmsgloo.ispermanent ) %]
                <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
            [% END %]
            [% IF ( errmsgloo.notissued ) %]
                <p class="problem">Not checked out.</p>
            [% END %]
            [% IF ( errmsgloo.localuse) %]
                <p class="problem">Local use recorded</p>
            [% END %]
            [% IF ( errmsgloo.waslost ) %]
                <p class="problem">Item was lost, now found.</p>
                [% IF ( LostItemFeeRefunded ) %]
                    <p class="problem">A refund has been applied to the borrowing patron's account.</p>
                [% ELSE %]
                    <p class="problem">Any lost item fees for this item will remain on the patron's account.</p>
                [% END %]
            [% END %]
            [% IF ( errmsgloo.withdrawn ) %]
                [% IF BlockReturnOfWithdrawnItems %]
                    <h5>Cannot check in</h5>
                    <p><strong>NOT CHECKED IN</strong></p>
                    <p class="problem">Item is withdrawn.</p>
                [% ELSE %]
                    <p class="problem">Item is withdrawn.</p>
                [% END %]
            [% END %]
            [% IF ( errmsgloo.debarred ) %]
                <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>
            [% END %]
            [% IF ( errmsgloo.prevdebarred ) %]
                <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p>
            [% END %]
            [% IF ( errmsgloo.foreverdebarred ) %]
                <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p>
            [% END %]
        [% END %]
    </div>
[% END %]

[% IF ( checkinmsg ) %]
    [% IF ( checkinmsgtype == 'alert' ) %]

        <p>Book drop mode.  (Effective checkin date is [% dropboxdate %] ).</p>
    </div>
</div>
<div class="yui-g">
    <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" >
    <div class="yui-u first">
            <fieldset>

            </td>
           </tr>
        [% END %]
    </table>
[% END %]
</div>
[% IF Koha.Preference('CircSidebar') %]
</div>
<div class="yui-b noprint">
    [% INCLUDE 'circ-nav.inc' %]
</div>
[% END %]
</div>
</div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-2 / +8 lines)
1	[% USE Branches %]	1	[% USE Branches %]
		2	[% USE Koha %]
2	[% INCLUDE 'doc-head-open.inc' %]	3	[% INCLUDE 'doc-head-open.inc' %]
3	<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>	4	<title>Koha &rsaquo; Circulation &rsaquo; Set library</title>
4	[% INCLUDE 'doc-head-close.inc' %]	5	[% INCLUDE 'doc-head-close.inc' %]
Lines 16-22 Link Here
16	&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>	17	&rsaquo; <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a>
17	</div>	18	</div>
18		19
19	<div id="doc" class="yui-t7">	20	[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
20	<div id="bd">	21	<div id="bd">
21	<div id="yui-main">	22	<div id="yui-main">
22	<div class="yui-b">	23	<div class="yui-b">
Lines 89-93 Updated:<ul> Link Here
89		90
90	</div>	91	</div>
91	</div>	92	</div>
92	</div>	93	[% IF Koha.Preference('CircSidebar') %]
		94	<div class="yui-b noprint">
		95	[% INCLUDE 'circ-nav.inc' %]
		96	</div>
		97	[% END %]
		98	</div>
93	[% INCLUDE 'intranet-bottom.inc' %]	99	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-1 / +9 lines)
		1	[% USE Koha %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% USE Branches %]	3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
Lines 29-38 $(document).ready(function() { Link Here
29		30
30	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers to receive</div>	31	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Transfers to receive</div>
31		32
32	<div id="doc" class="yui-t7">	33	[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
33		34
34	<div id="bd">	35	<div id="bd">
35	<div id="yui-main">	36	<div id="yui-main">
		37	[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
36	<div class="yui-g">	38	<div class="yui-g">
37		39
38	<h1>Transfers made to your library as of [% show_date \| $KohaDates %]</h1>	40	<h1>Transfers made to your library as of [% show_date \| $KohaDates %]</h1>
Lines 95-99 $(document).ready(function() { Link Here
95		97
96	</div>	98	</div>
97	</div>	99	</div>
		100	[% IF Koha.Preference('CircSidebar') %]
		101	</div>
		102	<div class="yui-b noprint">
		103	[% INCLUDE 'circ-nav.inc' %]
		104	</div>
		105	[% END %]
98	</div>	106	</div>
99	[% INCLUDE 'intranet-bottom.inc' %]	107	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +9 lines)
		1	[% USE Koha %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% USE ItemTypes %]	3	[% USE ItemTypes %]
3	[% USE Branches %]	4	[% USE Branches %]
Lines 53-62 $(document).ready(function() { Link Here
53	[% IF ( run_report ) %] &rsaquo; Results[% END %]	54	[% IF ( run_report ) %] &rsaquo; Results[% END %]
54	</div>	55	</div>
55		56
56	<div id="doc2" class="yui-t7">	57	[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc2" class="yui-t7">[% END %]
57		58
58	<div id="bd">	59	<div id="bd">
59	<div id="yui-main">	60	<div id="yui-main">
		61	[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
60	<div class="yui-g">	62	<div class="yui-g">
61		63
62	<h1>Holds queue</h1>	64	<h1>Holds queue</h1>
Lines 226-230 $(document).ready(function() { Link Here
226		228
227	</div>	229	</div>
228	</div>	230	</div>
		231	[% IF Koha.Preference('CircSidebar') %]
		232	</div>
		233	<div class="yui-b noprint">
		234	[% INCLUDE 'circ-nav.inc' %]
		235	</div>
		236	[% END %]
229	</div>	237	</div>
230	[% INCLUDE 'intranet-bottom.inc' %]	238	[% INCLUDE 'intranet-bottom.inc' %]

Lines 1-3 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-2 / +9 lines)
		1	[% USE Koha %]
1	[% USE KohaDates %]	2	[% USE KohaDates %]
2	[% USE Branches %]	3	[% USE Branches %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
Lines 31-40 Link Here
31	&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>	32	&rsaquo; <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a>
32	</div>	33	</div>
33		34
34	<div id="doc3" class="yui-t7">	35	[% IF Koha.Preference('CircSidebar') %]<div id="doc3" class="yui-t2">[% ELSE %]<div id="doc" class="yui-t7">[% END %]
35		36
36	<div id="bd">	37	<div id="bd">
37	<div id="yui-main">	38	<div id="yui-main">
		39	[% IF Koha.Preference('CircSidebar') %]<div class="yui-b">[% END %]
38	<div class="yui-g">	40	<div class="yui-g">
39		41
40	<h2>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]	42	<h2>Holds awaiting pickup for your library on: [% show_date \| $KohaDates %]
Lines 201-205 Link Here
201		203
202	</div>	204	</div>
203	</div>	205	</div>
		206	[% IF Koha.Preference('CircSidebar') %]
		207	</div>
		208	<div class="yui-b noprint">
		209	[% INCLUDE 'circ-nav.inc' %]
		210	</div>
		211	[% END %]
204	</div>	212	</div>
205	[% INCLUDE 'intranet-bottom.inc' %]	213	[% INCLUDE 'intranet-bottom.inc' %]
206	-

Return to bug 16530

Lines 24-35 use C4::Context; Link Here

(-)a/circ/renew.pl (-1 / +9 lines)
24	use C4::Auth qw/:DEFAULT get_session/;	24	use C4::Auth qw/:DEFAULT get_session/;
25	use C4::Output;	25	use C4::Output;
26	use C4::Circulation;	26	use C4::Circulation;
		27	use C4::Koha;
27	use Koha::DateUtils;	28	use Koha::DateUtils;
28	use Koha::Database;	29	use Koha::Database;
		30	use Koha::BiblioFrameworks;
29		31
30	my $cgi = new CGI;	32	my $cgi = new CGI;
31		33
32	my ( $template, $librarian, $cookie ) = get_template_and_user(	34	my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
33	{	35	{
34	template_name => "circ/renew.tt",	36	template_name => "circ/renew.tt",
35	query => $cgi,	37	query => $cgi,
Lines 116-119 if ($barcode) { Link Here
116	);	118	);
117	}	119	}
118		120
		121	# Checking if there is a Fast Cataloging Framework
		122	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		123
		124	# Checking if the transfer page needs to be displayed
		125	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		126
119	output_html_with_http_headers( $cgi, $cookie, $template->output );	127	output_html_with_http_headers( $cgi, $cookie, $template->output );

Lines 51-61 use Koha::AuthorisedValues; Link Here

(-)a/circ/returns.pl (-1 / +8 lines)
51	use Koha::DateUtils;	51	use Koha::DateUtils;
52	use Koha::Calendar;	52	use Koha::Calendar;
53	use Koha::Checkouts;	53	use Koha::Checkouts;
		54	use Koha::BiblioFrameworks;
54		55
55	my $query = new CGI;	56	my $query = new CGI;
56		57
57	#getting the template	58	#getting the template
58	my ( $template, $librarian, $cookie ) = get_template_and_user(	59	my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
59	{	60	{
60	template_name => "circ/returns.tt",	61	template_name => "circ/returns.tt",
61	query => $query,	62	query => $query,
Lines 647-651 if ( $itemnumber ) { Link Here
647	}	648	}
648	}	649	}
649		650
		651	# Checking if there is a Fast Cataloging Framework
		652	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		653
		654	# Checking if the transfer page needs to be displayed
		655	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		656
650	# actually print the page!	657	# actually print the page!
651	output_html_with_http_headers $query, $cookie, $template->output;	658	output_html_with_http_headers $query, $cookie, $template->output;

Lines 26-39 use C4::Output; Link Here

(-)a/circ/selectbranchprinter.pl (-2 / +8 lines)
26	use C4::Auth qw/:DEFAULT get_session/;	26	use C4::Auth qw/:DEFAULT get_session/;
27	use C4::Print; # GetPrinters	27	use C4::Print; # GetPrinters
28	use C4::Koha;	28	use C4::Koha;
29		29	use Koha::BiblioFrameworks;
30	use Koha::Libraries;	30	use Koha::Libraries;
31		31
32	# this will be the script that chooses branch and printer settings....	32	# this will be the script that chooses branch and printer settings....
33		33
34	my $query = CGI->new();	34	my $query = CGI->new();
35		35
36	my ( $template, $borrowernumber, $cookie ) = get_template_and_user({	36	my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({
37	template_name => "circ/selectbranchprinter.tt",	37	template_name => "circ/selectbranchprinter.tt",
38	query => $query,	38	query => $query,
39	type => "intranet",	39	type => "intranet",
Lines 134-137 $template->param( Link Here
134	recycle_loop=> \@recycle_loop,	134	recycle_loop=> \@recycle_loop,
135	);	135	);
136		136
		137	# Checking if there is a Fast Cataloging Framework
		138	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
		139
		140	# Checking if the transfer page needs to be displayed
		141	$template->param( display_transfer => 1 ) if ( ($flags->{'superlibrarian'} == 1) \|\| (C4::Context->preference("IndependentBranches") == 0) );
		142
137	output_html_with_http_headers $query, $cookie, $template->output;	143	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (+54 lines)
	1	<script type="text/javascript">//<![CDATA[
	2	$(document).ready(function() {
	3	var path = location.pathname.substring(1);
	4	var url = window.location.toString();
	5	var params = '';
	6	if ( url.match(/\?(.+)$/) ) {
	7	params = "?" + RegExp.$1;
	8	}
	9	$('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold');
	10	});
	11	//]]>
	12	</script>
	13
	14	<div id="navmenu">
	15	<div id="navmenulist">
	16
	17	<ul>
	18	<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li>
	19	</ul>
	20
	21	<h5>Circulation</h5>
	22	<ul>
	23	<li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li>
	24	<li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li>
	25	<li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li>
	26	[% IF ( display_transfer ) %]
	27	<li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
	28	[% END %]
	29	[% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %]
	30	<li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
	31	[% END %][% END %]
	32	[% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
	33	<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
	34	[% END %][% END %]
	35	</ul>
	36
	37	<h5>Circulation reports</h5>
	38	<ul>
	39	<li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li>
	40	<li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li>
	41	<li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li>
	42	<li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li>
	43	<li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li>
	44	[% IF ( CAN_user_circulate_overdues_report ) %]
	45	<li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
	46	[% END %]
	47	<li><a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a></li>
	48	[% IF Koha.Preference('OnSiteCheckouts') %]
	49	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
	50	[% END %]
	51	</ul>
	52
	53	</div>
	54	</div>