Attachment #71505 for bug #18403

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

Lines 32-38 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/circ/add_message.pl (-1 / +1 lines)
32	query => $input,	32	query => $input,
33	type => "intranet",	33	type => "intranet",
34	authnotrequired => 0,	34	authnotrequired => 0,
35	flagsrequired => { borrowers => 1 },	35	flagsrequired => { borrowers => 'edit_borrowers' },
36	debug => 1,	36	debug => 1,
37	}	37	}
38	);	38	);

Lines 32-38 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/circ/del_message.pl (-1 / +1 lines)
32	query => $input,	32	query => $input,
33	type => "intranet",	33	type => "intranet",
34	authnotrequired => 0,	34	authnotrequired => 0,
35	flagsrequired => { borrowers => 1 },	35	flagsrequired => { borrowers => 'edit_borrowers' },
36	debug => 1,	36	debug => 1,
37	}	37	}
38	);	38	);

Lines 49-55 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/edithelp.pl (-1 / +1 lines)
49	catalogue => 1,	49	catalogue => 1,
50	circulate => 1,	50	circulate => 1,
51	parameters => 1,	51	parameters => 1,
52	borrowers => 1,	52	borrowers => 'edit_borrowers',
53	permissions => 1,	53	permissions => 1,
54	reserveforothers => 1,	54	reserveforothers => 1,
55	reserveforself => 1,	55	reserveforself => 1,

Lines 21-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc (-2 / +2 lines)
21	</div>	21	</div>
22	[% END %]	22	[% END %]
23		23
24	[% IF ( CAN_user_borrowers ) %]	24	[% IF CAN_user_borrowers_edit_borrowers %]
25	<div id="patron_search" class="residentsearch">	25	<div id="patron_search" class="residentsearch">
26	<p class="tip">Enter patron card number or partial name:</p>	26	<p class="tip">Enter patron card number or partial name:</p>
27	<form action="/cgi-bin/koha/members/member.pl" method="post">	27	<form action="/cgi-bin/koha/members/member.pl" method="post">
Lines 42-48 Link Here
42	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	42	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
43	<li><a class="keep_text" href="#renew_search">Renew</a></li>	43	<li><a class="keep_text" href="#renew_search">Renew</a></li>
44	[% END %]	44	[% END %]
45	[% IF ( CAN_user_borrowers ) %]	45	[% IF CAN_user_borrowers_edit_borrowers %]
46	<li><a class="keep_text" href="#patron_search">Search patrons</a></li>	46	<li><a class="keep_text" href="#patron_search">Search patrons</a></li>
47	[% END %]	47	[% END %]
48	</ul>	48	</ul>




                     <th>Comment</th>
                     <th>Expiration</th>
                     <th>Created</th>
                     [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                         <th>&nbsp;</th>
                     [% END %]
                </tr>

			</td>
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
                        <td>[% d.created | $KohaDates %]</td>
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                            <td>
                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
                                    <i class="fa fa-trash"></i> Remove

            </tbody>
        </table>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />




          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
        [% END %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
    [% END %]
    [% IF ( CAN_user_updatecharges ) %]

    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( intranetreadinghistory ) %]
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
        [% END %]
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( intranetreadinghistory ) %]
            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% borrowernumber %]">Holds history</a></li>
        [% END %]

    [% IF ( CAN_user_parameters ) %]
        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrowernumber %]&amp;src=circ">Modification log</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( EnableBorrowerFiles ) %]
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
        [% END %]
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
    [% END %]
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>
    [% END %]
    [% IF Koha.Preference('HouseboundModule') %]

Lines 3-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc (-1 / +1 lines)
3	<div class="container-fluid">	3	<div class="container-fluid">
4	<ul id="toplevelmenu" class="nav navbar-nav">	4	<ul id="toplevelmenu" class="nav navbar-nav">
5	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]	5	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a></li>[% END %]
6	[% IF ( CAN_user_borrowers ) %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]	6	[% IF CAN_user_borrowers_edit_borrowers %]<li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>[% END %]
7	<li class="dropdown">	7	<li class="dropdown">
8	<a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">Search <b class="caret"></b></a>	8	<a href="/cgi-bin/koha/catalogue/search.pl" class="dropdown-toggle" data-toggle="dropdown">Search <b class="caret"></b></a>
9	<ul class="dropdown-menu">	9	<ul class="dropdown-menu">

Lines 21-27 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc (-2 / +2 lines)
21	</div>	21	</div>
22	[% END %]	22	[% END %]
23		23
24	[% IF ( CAN_user_borrowers ) %]	24	[% IF CAN_user_borrowers_edit_borrowers %]
25	<div id="patron_search" class="residentsearch">	25	<div id="patron_search" class="residentsearch">
26	<p class="tip">Enter patron card number or partial name:</p>	26	<p class="tip">Enter patron card number or partial name:</p>
27	<form action="/cgi-bin/koha/members/member.pl" method="post">	27	<form action="/cgi-bin/koha/members/member.pl" method="post">
Lines 44-50 Link Here
44	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]	44	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %]
45	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]	45	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %]
46	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]	46	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#renew_search">Renew</a></li>[% END %]
47	[% IF ( CAN_user_borrowers ) %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]	47	[% IF CAN_user_borrowers_edit_borrowers %]<li><a class="keep_text" href="#patron_search">Search patrons</a></li>[% END %]
48	[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]	48	[% IF ( CAN_user_catalogue ) %]<li><a class="keep_text" href="#catalog_search">Search the catalog</a></li>[% END %]
49	</ul>	49	</ul>
50		50

Lines 17-23 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc (-1 / +1 lines)
17	[% IF EnableBorrowerFiles %]	17	[% IF EnableBorrowerFiles %]
18	[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>	18	[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
19	[% END %]	19	[% END %]
20	[% IF CAN_user_borrowers && useDischarge %]	20	[% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
21	[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>	21	[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
22	[% END %]	22	[% END %]
23	[% IF Koha.Preference('HouseboundModule') %]	23	[% IF Koha.Preference('HouseboundModule') %]




<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( NorwegianPatronDBEnable == 1 ) %]
            $("#deletepatronlocal").click(function(){
                confirm_local_deletion();

</script>

<div id="toolbar" class="btn-toolbar">
    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF ( guarantor ) %]
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantor.borrowernumber %]&amp;categorycode=[% categorycode %]">
        [% ELSE %]

        <i class="fa fa-pencil"></i> Edit</a>
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
        [% END %]
        [% IF CAN_user_borrowers_edit_borrowers %]
            <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
        [% END %]
        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>

    <div class="btn-group">
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
            <ul class="dropdown-menu">
                [% IF CAN_user_borrowers_edit_borrowers %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]
                <li><a id="printslip" href="#">Print slip</a></li>
                <li><a id="printquickslip" href="#">Print quick slip</a></li>
                [% IF Borrowers.HasOverdues( borrowernumber ) %]

         <div class="btn-group">
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
            <ul class="dropdown-menu">
                [% IF CAN_user_borrowers_edit_borrowers %]
                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
                [% ELSE %]
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>

                [% ELSE %]
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
                [% END %]
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
                [% END %]
                [% IF CAN_user_borrowers_edit_borrowers %]
                    [% IF ( NorwegianPatronDBEnable == 1 ) %]
                        <li><a id="deletepatronlocal" href="#">Delete local</a></li>
                        <li><a id="deletepatronremote" href="#">Delete remote</a></li>

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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
772		772
773	[% IF ( has_modifications ) %]	773	[% IF ( has_modifications ) %]
774	<li><span class="circ-hlt">Pending modifications:</span> Patron has pending modifications.	774	<li><span class="circ-hlt">Pending modifications:</span> Patron has pending modifications.
775	[% IF CAN_user_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') \|\| borrower.branch == branch ) %]	775	[% IF CAN_user_borrowers_edit_borrowers && ( !Koha.Preference('IndependentBranchesPatronModifications') \|\| borrower.branch == branch ) %]
776	<a href="/cgi-bin/koha/members/members-update.pl">View all pending patron modifications</a>	776	<a href="/cgi-bin/koha/members/members-update.pl">View all pending patron modifications</a>
777	[% END %]	777	[% END %]
778	</li>	778	</li>




                            </li>
                            [% END %]

                            [% IF CAN_user_borrowers_edit_borrowers %]
                            <li>
                                <a class="icon_general icon_patrons" href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
                            </li>

                <div class="row">
                    <div class="col-sm-12">
                        [%# Following statement must be in one line for translatability %]
                        [% IF ( ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_acquisition && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests) %]
                            <div id="area-pending">
                                [% IF pending_article_requests %]
                                <div class="pending-info" id="article_requests_pending">

                                [% END %]


                                [% IF ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) %]
                                <div class="pending-info" id="patron_updates_pending">
                                    <a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
                                    <span class="pending-number-link">[% pending_borrower_modifications %]</span>
                                </div>
                                [% END %]

                                [% IF CAN_user_borrowers_edit_borrowers && pending_discharge_requests %]
                                <div class="pending-info" id="patron_discharges_pending">
                                    <a href="/cgi-bin/koha/members/discharges.pl">Discharge requests pending</a>:
                                    <span class="pending-number-link">[% pending_discharge_requests %]</span>

Lines 46-52 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt (-2 / +2 lines)
46	<th>Type</th>	46	<th>Type</th>
47	<th>Description</th>	47	<th>Description</th>
48	<th>Uploaded</th>	48	<th>Uploaded</th>
49	[% IF CAN_user_borrowers %]<th> </th>[% END %]	49	[% IF CAN_user_borrowers_edit_borrowers %]<th> </th>[% END %]
50	</tr>	50	</tr>
51	</thead>	51	</thead>
52		52
Lines 57-63 Link Here
57	<td>[% f.file_type %]</td>	57	<td>[% f.file_type %]</td>
58	<td>[% f.file_description %]</td>	58	<td>[% f.file_description %]</td>
59	<td>[% f.date_uploaded \| $KohaDates %]</td>	59	<td>[% f.date_uploaded \| $KohaDates %]</td>
60	[% IF CAN_user_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% borrowernumber %]&op=delete&file_id=[% f.file_id %]"><i class="fa fa-trash"></i> Delete</a></td>[% END %]	60	[% IF CAN_user_borrowers_edit_borrowers %]<td><a class="btn btn-default btn-xs confirmdelete" href="?borrowernumber=[% borrowernumber %]&op=delete&file_id=[% f.file_id %]"><i class="fa fa-trash"></i> Delete</a></td>[% END %]
61	</tr>	61	</tr>
62	[% END %]	62	[% END %]
63	</tbody>	63	</tbody>

Lines 348-354 function filterByFirstLetterSurname(letter) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
348	[% END %]	348	[% END %]
349	</div>	349	</div>
350		350
351	[% IF ( CAN_user_borrowers && pending_borrower_modifications ) %]	351	[% IF CAN_user_borrowers_edit_borrowers && pending_borrower_modifications %]
352	<div class="pending-info" id="patron_updates_pending">	352	<div class="pending-info" id="patron_updates_pending">
353	<a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:	353	<a href="/cgi-bin/koha/members/members-update.pl">Patrons requesting modifications</a>:
354	<span class="number_box"><a href="/cgi-bin/koha/members/members-update.pl">[% pending_borrower_modifications %]</a></span>	354	<span class="number_box"><a href="/cgi-bin/koha/members/members-update.pl">[% pending_borrower_modifications %]</a></span>




                                 <th>Comment</th>
                                 <th>Expiration</th>
                                 <th>Created</th>
                                 [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                   <th>Remove?</th>
                                 [% END %]
                            </tr>

                                    </td>
                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
                                    <td>[% d.created | $KohaDates %]</td>
                                    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                      <td>
                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
                                      </td>

                    <p>Patron is currently unrestricted.</p>
                [% END %]

                [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
                    <fieldset id="manual_restriction_form">
                        <input type="hidden" id="add_debarment" name="add_debarment" value="0" />

Lines 160-166 if ($show_results) { Link Here

(-)a/labels/label-item-search.pl (-1 / +1 lines)
160	query => $query,	160	query => $query,
161	type => "intranet",	161	type => "intranet",
162	authnotrequired => 0,	162	authnotrequired => 0,
163	flagsrequired => { borrowers => 1 },	163	flagsrequired => { borrowers => 'edit_borrowers' },
164	flagsrequired => { catalogue => 1 },	164	flagsrequired => { catalogue => 1 },
165	debug => 1,	165	debug => 1,
166	}	166	}

Lines 42-48 my ($template, $loggedinuser, $cookie) = get_template_and_user( Link Here

(-)a/members/boraccount.pl (-1 / +1 lines)
42	query => $input,	42	query => $input,
43	type => "intranet",	43	type => "intranet",
44	authnotrequired => 0,	44	authnotrequired => 0,
45	flagsrequired => { borrowers => 1,	45	flagsrequired => { borrowers => 'edit_borrowers',
46	updatecharges => 'remaining_permissions'},	46	updatecharges => 'remaining_permissions'},
47	debug => 1,	47	debug => 1,
48	}	48	}

Lines 27-33 use C4::Form::MessagingPreferences; Link Here

(-)a/members/default_messageprefs.pl (-1 / +1 lines)
27	# update the prefs if operator is creating a new patron and has	27	# update the prefs if operator is creating a new patron and has
28	# changed the patron category from its original value.	28	# changed the patron category from its original value.
29		29
30	my ($query, $response) = C4::Service->init(borrowers => 1);	30	my ($query, $response) = C4::Service->init(borrowers => 'edit_borrowers');
31	my ($categorycode) = C4::Service->require_params('categorycode');	31	my ($categorycode) = C4::Service->require_params('categorycode');
32	C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode }, $response);	32	C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode }, $response);
33	C4::Service->return_success( $response );	33	C4::Service->return_success( $response );

Lines 43-49 my ($template, $borrowernumber, $cookie) Link Here

(-)a/members/deletemem.pl (-2 / +2 lines)
43	query => $input,	43	query => $input,
44	type => "intranet",	44	type => "intranet",
45	authnotrequired => 0,	45	authnotrequired => 0,
46	flagsrequired => {borrowers => 1},	46	flagsrequired => {borrowers => 'edit_borrowers'},
47	debug => 1,	47	debug => 1,
48	});	48	});
49		49
Lines 89-95 if ($patron->category->category_type eq "S") { Link Here
89	exit 0; # Exit without error	89	exit 0; # Exit without error
90	}	90	}
91	} else {	91	} else {
92	unless(C4::Auth::haspermission($userenv->{'id'},{'borrowers'=>1})) {	92	unless(C4::Auth::haspermission($userenv->{'id'},{'borrowers'=>'edit_borrowers'})) {
93	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE");	93	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE");
94	exit 0; # Exit without error	94	exit 0; # Exit without error
95	}	95	}

Lines 48-54 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({ Link Here

(-)a/members/discharge.pl (-1 / +1 lines)
48	query => $input,	48	query => $input,
49	type => 'intranet',	49	type => 'intranet',
50	authnotrequired => 0,	50	authnotrequired => 0,
51	flagsrequired => { 'borrowers' => '*' },	51	flagsrequired => { 'borrowers' => 'edit_borrowers' },
52	});	52	});
53		53
54	my $borrowernumber = $input->param('borrowernumber');	54	my $borrowernumber = $input->param('borrowernumber');

Lines 33-39 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user({ Link Here

(-)a/members/discharges.pl (-1 / +1 lines)
33	query => $input,	33	query => $input,
34	type => "intranet",	34	type => "intranet",
35	authnotrequired => 0,	35	authnotrequired => 0,
36	flagsrequired => { borrowers => 1 },	36	flagsrequired => { borrowers => 'edit_borrowers' },
37	});	37	});
38		38
39	my $branchcode =	39	my $branchcode =

Lines 39-45 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/files.pl (-1 / +1 lines)
39	query => $cgi,	39	query => $cgi,
40	type => "intranet",	40	type => "intranet",
41	authnotrequired => 0,	41	authnotrequired => 0,
42	flagsrequired => { borrowers => 1 },	42	flagsrequired => { borrowers => 'edit_borrowers' },
43	debug => 1,	43	debug => 1,
44	}	44	}
45	);	45	);

Lines 35-41 my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user( Link Here

(-)a/members/guarantor_search.pl (-1 / +1 lines)
35	query => $input,	35	query => $input,
36	type => "intranet",	36	type => "intranet",
37	authnotrequired => 0,	37	authnotrequired => 0,
38	flagsrequired => { borrowers => 1 },	38	flagsrequired => { borrowers => 'edit_borrowers' },
39	}	39	}
40	);	40	);
41		41

Lines 47-53 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/housebound.pl (-1 / +1 lines)
47	query => $input,	47	query => $input,
48	type => 'intranet',	48	type => 'intranet',
49	authnotrequired => 0,	49	authnotrequired => 0,
50	flagsrequired => { borrowers => 1 },	50	flagsrequired => { borrowers => 'edit_borrowers' },
51	}	51	}
52	);	52	);
53		53

Lines 37-43 use Koha::Patrons; Link Here

(-)a/members/mancredit.pl (-2 / +2 lines)
37	use Koha::Patron::Categories;	37	use Koha::Patron::Categories;
38		38
39	my $input=new CGI;	39	my $input=new CGI;
40	my $flagsrequired = { borrowers => 1, updatecharges => 1 };	40	my $flagsrequired = { borrowers => 'edit_borrowers', updatecharges => 1 };
41		41
42	my $borrowernumber=$input->param('borrowernumber');	42	my $borrowernumber=$input->param('borrowernumber');
43		43
Lines 70-76 if ($add){ Link Here
70	query => $input,	70	query => $input,
71	type => "intranet",	71	type => "intranet",
72	authnotrequired => 0,	72	authnotrequired => 0,
73	flagsrequired => { borrowers => 1,	73	flagsrequired => { borrowers => 'edit_borrowers',
74	updatecharges => 'remaining_permissions' },	74	updatecharges => 'remaining_permissions' },
75	debug => 1,	75	debug => 1,
76	}	76	}

Lines 37-43 use Koha::Patrons; Link Here

(-)a/members/maninvoice.pl (-2 / +2 lines)
37	use Koha::Patron::Categories;	37	use Koha::Patron::Categories;
38		38
39	my $input=new CGI;	39	my $input=new CGI;
40	my $flagsrequired = { borrowers => 1 };	40	my $flagsrequired = { borrowers => 'edit_borrowers' };
41		41
42	my $borrowernumber=$input->param('borrowernumber');	42	my $borrowernumber=$input->param('borrowernumber');
43		43
Lines 88-94 if ($add){ Link Here
88	query => $input,	88	query => $input,
89	type => "intranet",	89	type => "intranet",
90	authnotrequired => 0,	90	authnotrequired => 0,
91	flagsrequired => { borrowers => 1,	91	flagsrequired => { borrowers => 'edit_borrowers',
92	updatecharges => 'remaining_permissions' },	92	updatecharges => 'remaining_permissions' },
93	debug => 1,	93	debug => 1,
94	});	94	});




        query           => $input,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { borrowers => 'edit_borrowers' },
        debug           => 1,
    }
);

my $flagsrequired;
$flagsrequired->{borrowers} = 1;

my $member      = $input->param('member');
my $cardnumber  = $input->param('cardnumber');
my $destination = $input->param('destination');

Lines 38-44 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/member.pl (-1 / +1 lines)
38	query => $input,	38	query => $input,
39	type => "intranet",	39	type => "intranet",
40	authnotrequired => 0,	40	authnotrequired => 0,
41	flagsrequired => {borrowers => 1},	41	flagsrequired => {borrowers => 'edit_borrowers'},
42	});	42	});
43		43
44	my $theme = $input->param('theme') \|\| "default";	44	my $theme = $input->param('theme') \|\| "default";

Lines 71-77 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/memberentry.pl (-1 / +1 lines)
71	query => $input,	71	query => $input,
72	type => "intranet",	72	type => "intranet",
73	authnotrequired => 0,	73	authnotrequired => 0,
74	flagsrequired => {borrowers => 1},	74	flagsrequired => {borrowers => 'edit_borrowers'},
75	debug => ($debug) ? 1 : 0,	75	debug => ($debug) ? 1 : 0,
76	});	76	});
77		77

Lines 35-41 my ($template, $loggedinuser, $cookie, $flags) Link Here

(-)a/members/members-home.pl (-1 / +1 lines)
35	query => $query,	35	query => $query,
36	type => "intranet",	36	type => "intranet",
37	authnotrequired => 0,	37	authnotrequired => 0,
38	flagsrequired => {borrowers => 1},	38	flagsrequired => {borrowers => 'edit_borrowers'},
39	debug => 1,	39	debug => 1,
40	});	40	});
41		41

Lines 33-39 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/members-update-do.pl (-1 / +1 lines)
33	query => $query,	33	query => $query,
34	type => "intranet",	34	type => "intranet",
35	authnotrequired => 0,	35	authnotrequired => 0,
36	flagsrequired => { borrowers => 1 },	36	flagsrequired => { borrowers => 'edit_borrowers' },
37	debug => 1,	37	debug => 1,
38	}	38	}
39	);	39	);

Lines 38-44 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/members/members-update.pl (-1 / +1 lines)
38	query => $query,	38	query => $query,
39	type => "intranet",	39	type => "intranet",
40	authnotrequired => 0,	40	authnotrequired => 0,
41	flagsrequired => { borrowers => 1 },	41	flagsrequired => { borrowers => 'edit_borrowers' },
42	debug => 1,	42	debug => 1,
43	}	43	}
44	);	44	);

Lines 27-33 use Koha::Patron::Debarments; Link Here

(-)a/members/mod_debarment.pl (-1 / +1 lines)
27		27
28	my $cgi = new CGI;	28	my $cgi = new CGI;
29		29
30	my ( $loggedinuser, $cookie, $sessionID ) = checkauth( $cgi, 0, { borrowers => 1 }, 'intranet' );	30	my ( $loggedinuser, $cookie, $sessionID ) = checkauth( $cgi, 0, { borrowers => 'edit_borrowers' }, 'intranet' );
31		31
32	my $borrowernumber = $cgi->param('borrowernumber');	32	my $borrowernumber = $cgi->param('borrowernumber');
33	my $action = $cgi->param('action');	33	my $action = $cgi->param('action');

Lines 100-109 if (defined $print and $print eq "page") { Link Here

(-)a/members/moremember.pl (-2 / +2 lines)
100	$flagsrequired = { circulate => "circulate_remaining_permissions" };	100	$flagsrequired = { circulate => "circulate_remaining_permissions" };
101	} elsif (defined $print and $print eq "brief") {	101	} elsif (defined $print and $print eq "brief") {
102	$template_name = "members/moremember-brief.tt";	102	$template_name = "members/moremember-brief.tt";
103	$flagsrequired = { borrowers => 1 };	103	$flagsrequired = { borrowers => 'edit_borrowers' };
104	} else {	104	} else {
105	$template_name = "members/moremember.tt";	105	$template_name = "members/moremember.tt";
106	$flagsrequired = { borrowers => 1 };	106	$flagsrequired = { borrowers => 'edit_borrowers' };
107	}	107	}
108		108
109	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(	109	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(

Lines 57-63 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/nl-search.pl (-1 / +1 lines)
57	query => $cgi,	57	query => $cgi,
58	type => "intranet",	58	type => "intranet",
59	authnotrequired => 0,	59	authnotrequired => 0,
60	flagsrequired => { borrowers => 1 },	60	flagsrequired => { borrowers => 'edit_borrowers' },
61	debug => 1,	61	debug => 1,
62	}	62	}
63	);	63	);

Lines 44-50 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/notices.pl (-1 / +1 lines)
44	query => $input,	44	query => $input,
45	type => "intranet",	45	type => "intranet",
46	authnotrequired => 0,	46	authnotrequired => 0,
47	flagsrequired => {borrowers => 1},	47	flagsrequired => {borrowers => 'edit_borrowers'},
48	debug => 1,	48	debug => 1,
49	});	49	});
50		50

Lines 53-59 our ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/pay.pl (-1 / +1 lines)
53	query => $input,	53	query => $input,
54	type => 'intranet',	54	type => 'intranet',
55	authnotrequired => 0,	55	authnotrequired => 0,
56	flagsrequired => { borrowers => 1, updatecharges => $updatecharges_permissions },	56	flagsrequired => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
57	debug => 1,	57	debug => 1,
58	}	58	}
59	);	59	);

Lines 42-48 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/paycollect.pl (-1 / +1 lines)
42	query => $input,	42	query => $input,
43	type => 'intranet',	43	type => 'intranet',
44	authnotrequired => 0,	44	authnotrequired => 0,
45	flagsrequired => { borrowers => 1, updatecharges => $updatecharges_permissions },	45	flagsrequired => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
46	debug => 1,	46	debug => 1,
47	}	47	}
48	);	48	);

Lines 41-47 my ($template, $loggedinuser, $cookie) Link Here

(-)a/members/printfeercpt.pl (-1 / +1 lines)
41	query => $input,	41	query => $input,
42	type => "intranet",	42	type => "intranet",
43	authnotrequired => 0,	43	authnotrequired => 0,
44	flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},	44	flagsrequired => {borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions'},
45	debug => 1,	45	debug => 1,
46	});	46	});
47		47

Lines 39-45 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/printinvoice.pl (-1 / +1 lines)
39	query => $input,	39	query => $input,
40	type => "intranet",	40	type => "intranet",
41	authnotrequired => 0,	41	authnotrequired => 0,
42	flagsrequired => { borrowers => 1, updatecharges => 'remaining_permissions' },	42	flagsrequired => { borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions' },
43	debug => 1,	43	debug => 1,
44	}	44	}
45	);	45	);

Lines 35-41 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/purchase-suggestions.pl (-1 / +1 lines)
35	query => $input,	35	query => $input,
36	type => "intranet",	36	type => "intranet",
37	authnotrequired => 0,	37	authnotrequired => 0,
38	flagsrequired => { borrowers => 1 },	38	flagsrequired => { borrowers => 'edit_borrowers' },
39	debug => 1,	39	debug => 1,
40	}	40	}
41	);	41	);

Lines 45-51 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => Link Here

(-)a/members/readingrec.pl (-1 / +1 lines)
45	query => $input,	45	query => $input,
46	type => "intranet",	46	type => "intranet",
47	authnotrequired => 0,	47	authnotrequired => 0,
48	flagsrequired => {borrowers => 1},	48	flagsrequired => {borrowers => 'edit_borrowers'},
49	debug => 1,	49	debug => 1,
50	});	50	});
51		51

Lines 34-40 use Koha::Patrons; Link Here

(-)a/members/setstatus.pl (-1 / +1 lines)
34		34
35	my $input = new CGI;	35	my $input = new CGI;
36		36
37	checkauth($input, 0, { borrowers => 1 }, 'intranet');	37	checkauth($input, 0, { borrowers => 'edit_borrowers' }, 'intranet');
38		38
39	my $destination = $input->param("destination") \|\| '';	39	my $destination = $input->param("destination") \|\| '';
40	my $borrowernumber=$input->param('borrowernumber');	40	my $borrowernumber=$input->param('borrowernumber');

Lines 40-46 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/statistics.pl (-1 / +1 lines)
40	query => $input,	40	query => $input,
41	type => "intranet",	41	type => "intranet",
42	authnotrequired => 0,	42	authnotrequired => 0,
43	flagsrequired => { borrowers => 1 },	43	flagsrequired => { borrowers => 'edit_borrowers' },
44	debug => 1,	44	debug => 1,
45	}	45	}
46	);	46	);

Lines 46-52 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/members/update-child.pl (-1 / +1 lines)
46	query => $input,	46	query => $input,
47	type => "intranet",	47	type => "intranet",
48	authnotrequired => 0,	48	authnotrequired => 0,
49	flagsrequired => { borrowers => 1 },	49	flagsrequired => { borrowers => 'edit_borrowers' },
50	debug => 1,	50	debug => 1,
51	}	51	}
52	);	52	);

Lines 33-39 my ($template, $loggedinuser, $cookie) Link Here

(-)a/opac/opac-overdrive-search.pl (-1 / +1 lines)
33	query => $cgi,	33	query => $cgi,
34	type => "opac",	34	type => "opac",
35	authnotrequired => 1,	35	authnotrequired => 1,
36	flagsrequired => {borrowers => 1},	36	flagsrequired => {borrowers => 'edit_borrowers'},
37	debug => 1,	37	debug => 1,
38	});	38	});
39		39

Lines 41-47 my $session = get_session($sessionID); Link Here

(-)a/svc/checkouts (-1 / +1 lines)
41	my $userid = $session->param('id');	41	my $userid = $session->param('id');
42		42
43	unless (haspermission($userid, { circulate => 'circulate_remaining_permissions' })	43	unless (haspermission($userid, { circulate => 'circulate_remaining_permissions' })
44	\|\| haspermission($userid, { borrowers => '*' })) {	44	\|\| haspermission($userid, { borrowers => 'edit_borrowers' })) {
45	exit 0;	45	exit 0;
46	}	46	}
47		47

Lines 36-42 my ($template, $user, $cookie) = get_template_and_user({ Link Here

(-)a/svc/members/search (-2 / +1 lines)
36	query => $input,	36	query => $input,
37	type => "intranet",	37	type => "intranet",
38	authnotrequired => 0,	38	authnotrequired => 0,
39	flagsrequired => { borrowers => 1 }	39	flagsrequired => { borrowers => 'edit_borrowers' }
40	});	40	});
41		41
42	my $searchmember = $input->param('searchmember');	42	my $searchmember = $input->param('searchmember');
43	-

Return to bug 18403

Lines 6-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-8 / +8 lines)
6	<script type="text/javascript">	6	<script type="text/javascript">
7	//<![CDATA[	7	//<![CDATA[
8	$(document).ready(function(){	8	$(document).ready(function(){
9	[% IF ( CAN_user_borrowers ) %]	9	[% IF CAN_user_borrowers_edit_borrowers %]
10	[% IF ( NorwegianPatronDBEnable == 1 ) %]	10	[% IF ( NorwegianPatronDBEnable == 1 ) %]
11	$("#deletepatronlocal").click(function(){	11	$("#deletepatronlocal").click(function(){
12	confirm_local_deletion();	12	confirm_local_deletion();
Lines 132-138 function searchToHold(){ Link Here
132	</script>	132	</script>
133		133
134	<div id="toolbar" class="btn-toolbar">	134	<div id="toolbar" class="btn-toolbar">
135	[% IF ( CAN_user_borrowers ) %]	135	[% IF CAN_user_borrowers_edit_borrowers %]
136	[% IF ( guarantor ) %]	136	[% IF ( guarantor ) %]
137	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% categorycode %]">	137	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% categorycode %]">
138	[% ELSE %]	138	[% ELSE %]
Lines 141-151 function searchToHold(){ Link Here
141	<i class="fa fa-pencil"></i> Edit</a>	141	<i class="fa fa-pencil"></i> Edit</a>
142	[% END %]	142	[% END %]
143		143
144	[% IF ( CAN_user_borrowers ) %]	144	[% IF CAN_user_borrowers_edit_borrowers %]
145	[% IF adultborrower AND Koha.Preference("borrowerRelationship") %]	145	[% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
146	<a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>	146	<a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
147	[% END %]	147	[% END %]
148	[% IF ( CAN_user_borrowers ) %]	148	[% IF CAN_user_borrowers_edit_borrowers %]
149	<a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>	149	<a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
150	[% END %]	150	[% END %]
151	<a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>	151	<a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% borrowernumber %]&categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
Lines 154-160 function searchToHold(){ Link Here
154	<div class="btn-group">	154	<div class="btn-group">
155	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>	155	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-print"></i> Print <span class="caret"></span></button>
156	<ul class="dropdown-menu">	156	<ul class="dropdown-menu">
157	[% IF ( CAN_user_borrowers ) %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]	157	[% IF CAN_user_borrowers_edit_borrowers %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]
158	<li><a id="printslip" href="#">Print slip</a></li>	158	<li><a id="printslip" href="#">Print slip</a></li>
159	<li><a id="printquickslip" href="#">Print quick slip</a></li>	159	<li><a id="printquickslip" href="#">Print quick slip</a></li>
160	[% IF Borrowers.HasOverdues( borrowernumber ) %]	160	[% IF Borrowers.HasOverdues( borrowernumber ) %]
Lines 172-178 function searchToHold(){ Link Here
172	<div class="btn-group">	172	<div class="btn-group">
173	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>	173	<button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
174	<ul class="dropdown-menu">	174	<ul class="dropdown-menu">
175	[% IF ( CAN_user_borrowers ) %]	175	[% IF CAN_user_borrowers_edit_borrowers %]
176	<li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=[% destination %]&reregistration=y">Renew patron</a></li>	176	<li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&destination=[% destination %]&reregistration=y">Renew patron</a></li>
177	[% ELSE %]	177	[% ELSE %]
178	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>	178	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
Lines 182-191 function searchToHold(){ Link Here
182	[% ELSE %]	182	[% ELSE %]
183	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>	183	<li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
184	[% END %]	184	[% END %]
185	[% IF CAN_user_borrowers && useDischarge %]	185	[% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
186	<li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>	186	<li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
187	[% END %]	187	[% END %]
188	[% IF ( CAN_user_borrowers ) %]	188	[% IF CAN_user_borrowers_edit_borrowers %]
189	[% IF ( NorwegianPatronDBEnable == 1 ) %]	189	[% IF ( NorwegianPatronDBEnable == 1 ) %]
190	<li><a id="deletepatronlocal" href="#">Delete local</a></li>	190	<li><a id="deletepatronlocal" href="#">Delete local</a></li>
191	<li><a id="deletepatronremote" href="#">Delete remote</a></li>	191	<li><a id="deletepatronremote" href="#">Delete remote</a></li>

Lines 1041-1047 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +3 lines)
1041	<th>Comment</th>	1041	<th>Comment</th>
1042	<th>Expiration</th>	1042	<th>Expiration</th>
1043	<th>Created</th>	1043	<th>Created</th>
1044	[% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]	1044	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1045	<th>Remove?</th>	1045	<th>Remove?</th>
1046	[% END %]	1046	[% END %]
1047	</tr>	1047	</tr>
Lines 1060-1066 $(document).ready(function() { Link Here
1060	</td>	1060	</td>
1061	<td>[% IF d.expiration %] [% d.expiration \| $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>	1061	<td>[% IF d.expiration %] [% d.expiration \| $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
1062	<td>[% d.created \| $KohaDates %]</td>	1062	<td>[% d.created \| $KohaDates %]</td>
1063	[% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]	1063	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1064	<td>	1064	<td>
1065	<input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />	1065	<input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
1066	</td>	1066	</td>
Lines 1073-1079 $(document).ready(function() { Link Here
1073	<p>Patron is currently unrestricted.</p>	1073	<p>Patron is currently unrestricted.</p>
1074	[% END %]	1074	[% END %]
1075		1075
1076	[% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]	1076	[% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
1077	<p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>	1077	<p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
1078	<fieldset id="manual_restriction_form">	1078	<fieldset id="manual_restriction_form">
1079	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />	1079	<input type="hidden" id="add_debarment" name="add_debarment" value="0" />

Lines 74-80 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-8 / +8 lines)
74	[% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&batch=1">Batch check out</a></li>	74	[% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&batch=1">Batch check out</a></li>
75	[% END %]	75	[% END %]
76	[% END %]	76	[% END %]
77	[% IF ( CAN_user_borrowers ) %]	77	[% IF CAN_user_borrowers_edit_borrowers %]
78	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>	78	[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
79	[% END %]	79	[% END %]
80	[% IF ( CAN_user_updatecharges ) %]	80	[% IF ( CAN_user_updatecharges ) %]
Lines 83-94 Link Here
83	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	83	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
84	[% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]	84	[% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
85	[% END %]	85	[% END %]
86	[% IF ( CAN_user_borrowers ) %]	86	[% IF CAN_user_borrowers_edit_borrowers %]
87	[% IF ( intranetreadinghistory ) %]	87	[% IF ( intranetreadinghistory ) %]
88	[% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>	88	[% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
89	[% END %]	89	[% END %]
90	[% END %]	90	[% END %]
91	[% IF ( CAN_user_borrowers ) %]	91	[% IF CAN_user_borrowers_edit_borrowers %]
92	[% IF ( intranetreadinghistory ) %]	92	[% IF ( intranetreadinghistory ) %]
93	[% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% borrowernumber %]">Holds history</a></li>	93	[% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% borrowernumber %]">Holds history</a></li>
94	[% END %]	94	[% END %]
Lines 96-117 Link Here
96	[% IF ( CAN_user_parameters ) %]	96	[% IF ( CAN_user_parameters ) %]
97	[% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% borrowernumber %]&src=circ">Modification log</a></li>	97	[% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% borrowernumber %]&src=circ">Modification log</a></li>
98	[% END %]	98	[% END %]
99	[% IF ( CAN_user_borrowers ) %]	99	[% IF CAN_user_borrowers_edit_borrowers %]
100	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>	100	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
101	[% END %]	101	[% END %]
102	[% IF ( CAN_user_borrowers ) %]	102	[% IF CAN_user_borrowers_edit_borrowers %]
103	[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>	103	[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
104	[% END %]	104	[% END %]
105	[% IF ( CAN_user_borrowers ) %]	105	[% IF CAN_user_borrowers_edit_borrowers %]
106	[% IF ( EnableBorrowerFiles ) %]	106	[% IF ( EnableBorrowerFiles ) %]
107	[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>	107	[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
108	[% END %]	108	[% END %]
109	[% END %]	109	[% END %]
110		110
111	[% IF ( CAN_user_borrowers ) %]	111	[% IF CAN_user_borrowers_edit_borrowers %]
112	[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>	112	[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
113	[% END %]	113	[% END %]
114	[% IF CAN_user_borrowers && useDischarge %]	114	[% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
115	[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>	115	[% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>
116	[% END %]	116	[% END %]
117	[% IF Koha.Preference('HouseboundModule') %]	117	[% IF Koha.Preference('HouseboundModule') %]

Lines 32-45 my ( $template, $loggedinuser, $cookie, $staffflags ) = get_template_and_user( Link Here

(-)a/members/member-password.pl (-4 / +1 lines)
32	query => $input,	32	query => $input,
33	type => "intranet",	33	type => "intranet",
34	authnotrequired => 0,	34	authnotrequired => 0,
35	flagsrequired => { borrowers => 1 },	35	flagsrequired => { borrowers => 'edit_borrowers' },
36	debug => 1,	36	debug => 1,
37	}	37	}
38	);	38	);
39		39
40	my $flagsrequired;
41	$flagsrequired->{borrowers} = 1;
42
43	my $member = $input->param('member');	40	my $member = $input->param('member');
44	my $cardnumber = $input->param('cardnumber');	41	my $cardnumber = $input->param('cardnumber');
45	my $destination = $input->param('destination');	42	my $destination = $input->param('destination');