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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-1 / +1 lines)
Lines 18-24 Link Here
18
18
19
<h5>Basic parameters</h5>
19
<h5>Basic parameters</h5>
20
<ul>
20
<ul>
21
	<li><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches, groups</a></li>
21
	<li><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></li>
22
	<li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
22
	<li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
23
	<li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
23
	<li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
24
</ul>
24
</ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-toolbar.inc (-1 / +1 lines)
Lines 47-53 Link Here
47
                            [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
47
                            [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
48
                        },
48
                        },
49
49
50
                        { text: _("Plan by Branches"),
50
                        { text: _("Plan by libraries"),
51
                            url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=BRANCHES"
51
                            url: "/cgi-bin/koha/admin/aqplan.pl?budget_period_id=[% budget_period_id %]&authcat=BRANCHES"
52
                            [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
52
                            [% UNLESS ( CAN_user_acquisition_planning_manage ) %],  id:'disabled' [% END %]
53
                        },
53
                        },
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
Lines 58-64 Link Here
58
        [% END %]
58
        [% END %]
59
    [% END %][% END %]
59
    [% END %][% END %]
60
    <li>Category: [% categoryname %] ([% categorycode %])</li>
60
    <li>Category: [% categoryname %] ([% categorycode %])</li>
61
    <li>Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
61
    <li>Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
62
</ul></div>
62
</ul></div>
63
<div id="menu">
63
<div id="menu">
64
<ul>
64
<ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-1 / +1 lines)
Lines 61-67 in the global namespace %] Link Here
61
        [% END %]
61
        [% END %]
62
    [% END %][% END %]
62
    [% END %][% END %]
63
    <li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
63
    <li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
64
    <li>Home Library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
64
    <li>Home library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
65
</ul></div>
65
</ul></div>
66
<div id="menu">
66
<div id="menu">
67
<ul>
67
<ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/error-messages.inc (-2 / +2 lines)
Lines 80-86 window.onload=function(){ Link Here
80
        [% ELSIF ( 202 ) %]
80
        [% ELSIF ( 202 ) %]
81
        An error has occurred. Please ask your system administrator to check the error log for more details.
81
        An error has occurred. Please ask your system administrator to check the error log for more details.
82
        [% ELSIF ( 203 ) %]
82
        [% ELSIF ( 203 ) %]
83
        A non-existent or invalid branch code was supplied. Please <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a branch selected.
83
        A non-existent or invalid library code was supplied. Please <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">verify</a> that you have a library selected.
84
        [% ELSIF ( 301 ) %]
84
        [% ELSIF ( 301 ) %]
85
        An error has occurred while attempting to upload the image file. Please ask you system administrator to check the error log for more details.
85
        An error has occurred while attempting to upload the image file. Please ask you system administrator to check the error log for more details.
86
        [% ELSIF ( 302 ) %]
86
        [% ELSIF ( 302 ) %]
Lines 90-96 window.onload=function(){ Link Here
90
        [% ELSIF ( 401 ) %]
90
        [% ELSIF ( 401 ) %]
91
        An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details.
91
        An error has occurred and the item(s) was not added to batch [% batch_id %]. Please have your system administrator check the error log for details.
92
        [% ELSIF ( 402 ) %]
92
        [% ELSIF ( 402 ) %]
93
        The item(s) was not added because the branch is not set. Please set your branch before adding items to a batch.
93
        The item(s) was not added because the library is not set. Please set your library before adding items to a batch.
94
        [% ELSIF ( 403 ) %]
94
        [% ELSIF ( 403 ) %]
95
        An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details.
95
        An error has occurred and the item(s) was not removed from batch [% batch_id %]. Please have your system administrator check the error log for details.
96
        [% ELSIF ( 404 ) %]
96
        [% ELSIF ( 404 ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-2 / +2 lines)
Lines 79-85 $(document).ready(function() { Link Here
79
79
80
        [% IF ( loop_budget ) %]
80
        [% IF ( loop_budget ) %]
81
81
82
            <h3>All available funds[% IF ( branchname ) %] for [% branchname %] branch[% END %]</h3>
82
            <h3>All available funds[% IF ( branchname ) %] for [% branchname %] library[% END %]</h3>
83
83
84
    <!-- <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage funds ]">[ Manage ]</a>
84
    <!-- <a href="/cgi-bin/koha/admin/aqbookfund.pl" title="[ Manage funds ]">[ Manage ]</a>
85
    <a href="/cgi-bin/koha/admin/budgetperiods.pl">manage budgets</a><br><br>  -->
85
    <a href="/cgi-bin/koha/admin/budgetperiods.pl">manage budgets</a><br><br>  -->
Lines 92-98 $(document).ready(function() { Link Here
92
        <tr>
92
        <tr>
93
            <th>Fund</th>
93
            <th>Fund</th>
94
            <th>Owner</th>
94
            <th>Owner</th>
95
            <th>Branch</th>
95
            <th>Library</th>
96
            <th>Amount</th>
96
            <th>Amount</th>
97
            <th>Ordered</th>
97
            <th>Ordered</th>
98
            <th>Spent</th>
98
            <th>Spent</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +2 lines)
Lines 30-37 Link Here
30
<div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
30
<div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
31
<h3>Basic parameters</h3>
31
<h3>Basic parameters</h3>
32
<dl>
32
<dl>
33
        <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries, branches and groups</a></dt>
33
        <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></dt>
34
        <dd>Define libraries, branches and groups.</dd>
34
        <dd>Define libraries and groups.</dd>
35
        <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
35
        <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
36
        <dd>Define item types used for circulation rules.</dd>
36
        <dd>Define item types used for circulation rules.</dd>
37
        <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></dt>
37
        <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget_owner_search.tt (-1 / +1 lines)
Lines 52-58 function returnOwner(ownerId, ownerName){ Link Here
52
		<tr>
52
		<tr>
53
			<th>Cardnumber</th>
53
			<th>Cardnumber</th>
54
			<th>Name</th>
54
			<th>Name</th>
55
			<th>Branch</th>
55
			<th>Library</th>
56
			<th>Categorycode</th>
56
			<th>Categorycode</th>
57
            <th>Select?</th>
57
            <th>Select?</th>
58
		</tr>
58
		</tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt (-3 / +3 lines)
Lines 118-130 Link Here
118
<!-- -->
118
<!-- -->
119
[% IF ( branches_empty ) %]
119
[% IF ( branches_empty ) %]
120
    <tr>
120
    <tr>
121
        <td>branch not defined</td>
121
        <td>library not defined</td>
122
        <td>at least 1 branch must be defined</td>
122
        <td>at least 1 library must be defined</td>
123
    </tr>
123
    </tr>
124
[% ELSE %] 
124
[% ELSE %] 
125
    <tr>
125
    <tr>
126
        <td>OK</td>             
126
        <td>OK</td>             
127
        <td>at least 1 branch defined</td>
127
        <td>at least 1 library defined</td>
128
    </tr>                                       
128
    </tr>                                       
129
[% END %]
129
[% END %]
130
<!-- -->
130
<!-- -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref (-1 / +1 lines)
Lines 20-26 Acquisitions: Link Here
20
        - pref: AcqViewBaskets
20
        - pref: AcqViewBaskets
21
          choices:
21
          choices:
22
              user: created by staff member.
22
              user: created by staff member.
23
              branch: from staff member's branch.
23
              branch: from staff member's library.
24
              all: in system, regardless of owner.
24
              all: in system, regardless of owner.
25
    -
25
    -
26
        - Display currencies using the following format 
26
        - Display currencies using the following format 
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref (-1 / +1 lines)
Lines 5-11 Administration: Link Here
5
            - Use
5
            - Use
6
            - pref: KohaAdminEmailAddress
6
            - pref: KohaAdminEmailAddress
7
              class: email
7
              class: email
8
            - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular branch, and is referred to when an internal error occurs.)"
8
            - "as the email address for the administrator of Koha. (This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)"
9
        -
9
        -
10
            - Show
10
            - Show
11
            - pref: DebugLevel
11
            - pref: DebugLevel
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-3 / +3 lines)
Lines 151-163 Circulation: Link Here
151
              choices:
151
              choices:
152
                  yes: Do
152
                  yes: Do
153
                  no: "Don't"
153
                  no: "Don't"
154
            - automatically transfer items to their home branch when they are returned.
154
            - automatically transfer items to their home library when they are returned.
155
        -
155
        -
156
            - pref: UseBranchTransferLimits
156
            - pref: UseBranchTransferLimits
157
              choices:
157
              choices:
158
                  yes: Enforce
158
                  yes: Enforce
159
                  no: "Don't enforce"
159
                  no: "Don't enforce"
160
            - branch transfer limits based on
160
            - library transfer limits based on
161
            - pref: BranchTransferLimitsType
161
            - pref: BranchTransferLimitsType
162
              choices:
162
              choices:
163
                  ccode: collection code
163
                  ccode: collection code
Lines 315-321 Circulation: Link Here
315
              choices:
315
              choices:
316
                  yes: Allow
316
                  yes: Allow
317
                  no: "Don't allow"
317
                  no: "Don't allow"
318
            - a user to choose the branch to pick up a hold from.
318
            - a user to choose the library to pick up a hold from.
319
        -
319
        -
320
            - pref: ReservesNeedReturns
320
            - pref: ReservesNeedReturns
321
              choices:
321
              choices:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-6 / +6 lines)
Lines 317-323 OPAC: Link Here
317
              choices:
317
              choices:
318
                  yes: "Don't allow"
318
                  yes: "Don't allow"
319
                  no: Allow
319
                  no: Allow
320
            - patrons to select their branch on the OPAC.
320
            - patrons to select their library on the OPAC.
321
        -
321
        -
322
            - pref: SearchMyLibraryFirst
322
            - pref: SearchMyLibraryFirst
323
              choices:
323
              choices:
Lines 352-360 OPAC: Link Here
352
            - Use 
352
            - Use 
353
            - pref: OpacRenewalBranch
353
            - pref: OpacRenewalBranch
354
              choices:
354
              choices:
355
                  itemhomebranch: "the item's home branch"
355
                  itemhomebranch: "the item's home library"
356
                  patronhomebranch: "the patron's home branch"
356
                  patronhomebranch: "the patron's home library"
357
                  checkoutbranch: "the branch the item was checked out from"
357
                  checkoutbranch: "the library the item was checked out from"
358
                  null: "NULL"
358
                  null: "NULL"
359
                  opacrenew: "'OPACRenew'"
359
                  opacrenew: "'OPACRenew'"
360
            - as branchcode to store in the statistics table.
360
            - as branchcode to store in the statistics table.
Lines 375-381 OPAC: Link Here
375
              choices:
375
              choices:
376
                  no: "Don't allow"
376
                  no: "Don't allow"
377
                  yes: Allow
377
                  yes: Allow
378
            - patrons to select branch when making a purchase suggestion
378
            - patrons to select library when making a purchase suggestion
379
        -
379
        -
380
            - pref: OpacHiddenItems
380
            - pref: OpacHiddenItems
381
              type: textarea
381
              type: textarea
Lines 435-441 OPAC: Link Here
435
              choices:
435
              choices:
436
                  yes: Use
436
                  yes: Use
437
                  no: "Don't use"
437
                  no: "Don't use"
438
            - "the item home branch when finding items for the shelf browser."      
438
            - "the item home library when finding items for the shelf browser."      
439
        -
439
        -
440
            - pref: ShelfBrowserUsesCcode
440
            - pref: ShelfBrowserUsesCcode
441
              default: 0
441
              default: 0
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (-1 / +1 lines)
Lines 159-165 Searching: Link Here
159
              choices:
159
              choices:
160
                  yes: Show
160
                  yes: Show
161
                  no: "Don't show"
161
                  no: "Don't show"
162
            - "an item's branch, location and call number in OPAC search results."
162
            - "an item's library, location and call number in OPAC search results."
163
        -
163
        -
164
            - Truncate facets length to
164
            - Truncate facets length to
165
            - pref: FacetLabelTruncationLength
165
            - pref: FacetLabelTruncationLength
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-1 / +1 lines)
Lines 28-34 Link Here
28
[% END %]
28
[% END %]
29
29
30
[% IF ( wrongip ) %]
30
[% IF ( wrongip ) %]
31
<div id="login_error"><strong>Error: </strong>Independent Branches and Autolocation are switched on and you are logging in with an IP address that doesn't match your branch. </div>
31
<div id="login_error"><strong>Error: </strong>IndependentBranches and Autolocation are switched on and you are logging in with an IP address that doesn't match your library. </div>
32
[% END %]
32
[% END %]
33
33
34
[% IF ( invalid_username_or_password ) %]
34
[% IF ( invalid_username_or_password ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +1 lines)
Lines 481-487 function verify_images() { Link Here
481
    <p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p> 
481
    <p> (There are [% subscriptionsnumber %] subscriptions associated with this title).</p> 
482
    [% FOREACH subscription IN subscriptions %]
482
    [% FOREACH subscription IN subscriptions %]
483
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
483
	    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
484
	    [% IF ( subscription.branchcode ) %]<h3>At branch: [% subscription.branchcode %]</h3>[% END %][% END %]
484
	    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
485
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
485
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
486
            [% IF ( subscription.latestserials ) %]
486
            [% IF ( subscription.latestserials ) %]
487
            <p> The [% subscription.staffdisplaycount %] latest issues related to this subscription:</p>
487
            <p> The [% subscription.staffdisplaycount %] latest issues related to this subscription:</p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt (-1 / +1 lines)
Lines 188-194 function set_to_today(id, force) { Link Here
188
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
188
[% IF ( no_next_barcode ) %]<div class="dialog alert"><strong>Error saving items</strong>: Unable to automatically determine values for barcodes. No item has been inserted.</div>[% END %]
189
[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div>[% END %]
189
[% IF ( book_on_loan ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: item is checked out.</div>[% END %]
190
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot Delete</strong>: item has a waiting hold.</div>[% END %]
190
[% IF ( book_reserved ) %]<div class="dialogalert"><strong>Cannot Delete</strong>: item has a waiting hold.</div>[% END %]
191
[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: The items do not belong to your branch.</div>[% END %]
191
[% IF ( not_same_branch ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: The items do not belong to your library.</div>[% END %]
192
[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&amp;analyze=1">analytics.</a>.</div>[% END %]
192
[% IF ( linked_analytics ) %]<div class="dialog alert"><strong>Cannot Delete</strong>: item has linked <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblionumber %]&amp;analyze=1">analytics.</a>.</div>[% END %]
193
193
194
<div id="cataloguing_additem_itemlist">
194
<div id="cataloguing_additem_itemlist">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 195-201 function Dopop(link) { Link Here
195
    [% END %]
195
    [% END %]
196
196
197
    [% IF ( transfer ) %]
197
    [% IF ( transfer ) %]
198
    <!-- transfer: item with no reservation, must be returned to its homebranch -->
198
    <!-- transfer: item with no reservation, must be returned to its home library -->
199
	<div id="return1" class="dialog message">
199
	<div id="return1" class="dialog message">
200
            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> )</h3>
200
            <h3>Please return <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> to [% homebranchname %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;">Print Slip</a> )</h3>
201
        </div>
201
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt (-1 / +1 lines)
Lines 50-56 Updated:<ul> Link Here
50
	<legend>Set Library</legend>
50
	<legend>Set Library</legend>
51
    <ol>
51
    <ol>
52
    [% IF ( singleBranchMode ) %]
52
    [% IF ( singleBranchMode ) %]
53
        <li>Single Branch mode is ON.</li>
53
        <li>SingleBranchMode is ON.</li>
54
    [% ELSE %]
54
    [% ELSE %]
55
        <li><label for="branch">Choose library:</label>
55
        <li><label for="branch">Choose library:</label>
56
        <select name="branch" id="branch">
56
        <select name="branch" id="branch">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-1 / +1 lines)
Lines 41-47 $.tablesorter.addParser({ Link Here
41
        <h2>Holds awaiting pickup for your library on: [% show_date %]
41
        <h2>Holds awaiting pickup for your library on: [% show_date %]
42
            [% IF ( all_branches_link ) %]
42
            [% IF ( all_branches_link ) %]
43
            <span style="margin-left:20px"><a href="[% all_branches_link %]">
43
            <span style="margin-left:20px"><a href="[% all_branches_link %]">
44
            View all branches</a></span>
44
            View all libraries</a></span>
45
            [% END %]
45
            [% END %]
46
        </h2>
46
        </h2>
47
    [% IF ( cancel_result ) %]
47
    [% IF ( cancel_result ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/branch_transfer_limits.tt (-2 / +2 lines)
Lines 14-21 Link Here
14
14
15
<p>Check the boxes for the libraries that you accept checkins from for the item type you have selected at the top.</p>
15
<p>Check the boxes for the libraries that you accept checkins from for the item type you have selected at the top.</p>
16
16
17
<p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their branch.</p>
17
<p>In the above example, Centerville library will allow patrons to return items from all libraries except Liberty and Franklin to their library.</p>
18
18
19
<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
19
<p><strong>See the full documentation for Library Transfer Limits in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#libtransferlimits">manual</a> (online).</strong></p>
20
20
21
[% INCLUDE 'help-bottom.inc' %]
21
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt (-3 / +3 lines)
Lines 16-28 Link Here
16
	<li>all libraries, all patron types, all item types</li>
16
	<li>all libraries, all patron types, all item types</li>
17
</ul>
17
</ul>
18
18
19
<p style="background-color: #ffe599;">Tip: If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)</p>
19
<p style="background-color: #ffe599;">Tip: If you are a single library system choose your library name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)</p>
20
20
21
<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
21
<p style="color: #990000;">Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.</p>
22
22
23
<h2>Default Circulation Rules</h2>
23
<h2>Default Circulation Rules</h2>
24
24
25
<p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches):</p>
25
<p>Using the issuing rules matrix you can define rules that depend on patron/item type combos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all libraries):</p>
26
26
27
<p>From the matrix you can choose any combination of patron categories and item types to apply the rules to</p>
27
<p>From the matrix you can choose any combination of patron categories and item types to apply the rules to</p>
28
<ul>
28
<ul>
Lines 83-89 Link Here
83
83
84
<p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</p>
84
<p style="color: #990000;">Important: Note that if the system preference AllowHoldPolicyOverride set to 'allow', these policies can be overridden by your circulation staff.</p>
85
85
86
<p style="color: #990000;">Important: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.</p>
86
<p style="color: #990000;">Important: These policies are based on the patron's home library, not the library that the reserving staff member is from.</p>
87
87
88
<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
88
<p><strong>See the full documentation for Circulation and Fine Rules in the <a href="http://manual.koha-community.org/3.6/en/patscirc.html#circfinerules">manual</a> (online).</strong></p>
89
89
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchtransfers.tt (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
<h1>Transfers</h1>
3
<h1>Transfers</h1>
4
4
5
<p>If you work in a multi-branch system you can transfer items from one library to another by using the Transfer tool. To transfer an item</p>
5
<p>If you work in a multi-library system you can transfer items from one library to another by using the Transfer tool. To transfer an item</p>
6
6
7
<ul>
7
<ul>
8
	<li>Click 'Transfer' on the Circulation page
8
	<li>Click 'Transfer' on the Circulation page
Lines 13-19 Link Here
13
</li>
13
</li>
14
	<li>Click 'Submit'</li>
14
	<li>Click 'Submit'</li>
15
	<li>The item will now say that it is in transit</li>
15
	<li>The item will now say that it is in transit</li>
16
	<li>When the item arrives at the other branch the librarian must check the item in to acknowledge that it is no longer in transit</li>
16
	<li>When the item arrives at the other library the librarian must check the item in to acknowledge that it is no longer in transit</li>
17
	<li>The item will not be permanently moved to the new library
17
	<li>The item will not be permanently moved to the new library
18
<ul>
18
<ul>
19
	<li>The item shows the same 'Home Library' but has updated the 'Current Location' to note where it resides at this time</li>
19
	<li>The item shows the same 'Home Library' but has updated the 'Current Location' to note where it resides at this time</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt (-5 / +5 lines)
Lines 27-38 Link Here
27
<p>There are several messages that can appear when checking items in:</p>
27
<p>There are several messages that can appear when checking items in:</p>
28
28
29
<ul>
29
<ul>
30
	<li>If you are checking an item in at a library other than the home branch, a message will appear asking you to transfer the book to the home library
30
	<li>If you are checking an item in at a library other than the home library, a message will appear asking you to transfer the book to the home library
31
<ul>
31
<ul>
32
	<li>After this item is checked in the status of the item will be changed in the catalog to 'in transit'</li>
32
	<li>After this item is checked in the status of the item will be changed in the catalog to 'in transit'</li>
33
	<li>To mark an item as back at the home branch, check the item in at the home branch
33
	<li>To mark an item as back at the home library, check the item in at the home library
34
<ul>
34
<ul>
35
	<li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home branch.</li>
35
	<li>A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home library.</li>
36
</ul>
36
</ul>
37
</li>
37
</li>
38
</ul>
38
</ul>
Lines 44-50 Link Here
44
	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
44
	<li>Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)</li>
45
</ul>
45
</ul>
46
</li>
46
</li>
47
	<li>If you're checking in an item that has a hold on it at another branch you will be prompted to confirm and transfer the item
47
	<li>If you're checking in an item that has a hold on it at another library you will be prompted to confirm and transfer the item
48
<ul>
48
<ul>
49
	<li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed</li>
49
	<li>Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed</li>
50
	<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
50
	<li>Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information</li>
Lines 55-58 Link Here
55
55
56
<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.6/en/checkingin.html">manual</a> (online).</strong></p>
56
<p><strong>See the full documentation for Checking In in the <a href="http://manual.koha-community.org/3.6/en/checkingin.html">manual</a> (online).</strong></p>
57
57
58
[% INCLUDE 'help-bottom.inc' %]
58
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/itemslost.tt (-3 / +3 lines)
Lines 2-15 Link Here
2
2
3
<h1>Lost Items</h1>
3
<h1>Lost Items</h1>
4
4
5
<p> This one-step report will show you how many items of each item type are currently in your branch library or libraries.</p>
5
<p> This one-step report will show you how many items of each item type are currently in your library or libraries.</p>
6
6
7
		<ul>
7
		<ul>
8
			<li>Go to the 'Reports' module (usually under 'More' in your Global Nav)</li>
8
			<li>Go to the 'Reports' module (usually under 'More' in your Global Nav)</li>
9
			<li>Choose 'Lost Items' under 'Other'</li>
9
			<li>Choose 'Lost Items' under 'Other'</li>
10
			<li>Choose category to 'Order by' (the 'order by' field effects what ordering method is used when displaying the lost items)</li>
10
			<li>Choose category to 'Order by' (the 'order by' field effects what ordering method is used when displaying the lost items)</li>
11
			<li>Enter a 'Barcode' if searching for a single item; if not leave this field blank</li>
11
			<li>Enter a 'Barcode' if searching for a single item; if not leave this field blank</li>
12
			<li>Choose a 'Branch' to perform the report on (or choose 'All' field at the top of the dropdown menu to choose all branches)</li>
12
			<li>Choose a 'Library' to perform the report on (or choose 'All' field at the top of the dropdown menu to choose all libraries)</li>
13
			<li>Choose an 'Item Type' to perform the report on (or, leave at the default 'All' to perform the report on all item types)</li>
13
			<li>Choose an 'Item Type' to perform the report on (or, leave at the default 'All' to perform the report on all item types)</li>
14
			<li>Choose a 'Lost Status' to search only for items that are assumed lost (long overdue), missing, or lost (or, leave this set to 'All' to see all lost items)</li>
14
			<li>Choose a 'Lost Status' to search only for items that are assumed lost (long overdue), missing, or lost (or, leave this set to 'All' to see all lost items)</li>
15
			<li>Click 'Submit'</li>
15
			<li>Click 'Submit'</li>
Lines 18-21 Link Here
18
18
19
<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
19
<p><strong>See the full documentation for the Lost Items report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#lostreport">manual</a> (online).</strong></p>
20
	
20
	
21
[% INCLUDE 'help-bottom.inc' %]
21
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/manager.tt (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
<h1>Catalog by Item Type</h1>
3
<h1>Catalog by Item Type</h1>
4
4
5
<p>This report will list the total number of items of each item type per branch.</p>
5
<p>This report will list the total number of items of each item type per library.</p>
6
6
7
<p>If you choose to output to the browser your results will print to the screen.</p>
7
<p>If you choose to output to the browser your results will print to the screen.</p>
8
8
Lines 10-13 Link Here
10
10
11
<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
11
<p><strong>See the full documentation for the Catalog by Item Type report in the <a href="http://manual.koha-community.org/3.6/en/statsreports.html#catbyitem">manual</a> (online).</strong></p>
12
12
13
[% INCLUDE 'help-bottom.inc' %]
13
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reserve/request.tt (-2 / +2 lines)
Lines 60-66 Link Here
60
60
61
<p>When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold</p>
61
<p>When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold</p>
62
62
63
<p>Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper branch. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
63
<p>Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper library. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.</p>
64
64
65
<p>Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.</p>
65
<p>Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.</p>
66
66
Lines 72-75 Link Here
72
72
73
<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
73
<p><strong>See the full documentation for Holds in the <a href="http://manual.koha-community.org/3.6/en/holds.html">manual</a> (online).</strong></p>
74
74
75
[% INCLUDE 'help-bottom.inc' %]
75
[% INCLUDE 'help-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/subscription-add.tt (-1 / +1 lines)
Lines 22-28 Link Here
22
	<li>Next you can choose whether a new item is created when receiving an issue</li>
22
	<li>Next you can choose whether a new item is created when receiving an issue</li>
23
	<li>'Location' is for the shelving location</li>
23
	<li>'Location' is for the shelving location</li>
24
	<li>'Call Number' is for your item's call number prefix</li>
24
	<li>'Call Number' is for your item's call number prefix</li>
25
	<li>'Library' is the branch that owns this subscription.
25
	<li>'Library' is the library that owns this subscription.
26
<ul>
26
<ul>
27
	<li>If more than one library subscribes to this serial you will need to create a subscription for each library</li>
27
	<li>If more than one library subscribes to this serial you will need to create a subscription for each library</li>
28
	<li>This can be done easily by using the 'Edit as New (Duplicate)' option found on the subscription information page and changing only the 'Library' field</li>
28
	<li>This can be done easily by using the 'Edit as New (Duplicate)' option found on the subscription information page and changing only the 'Library' field</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt (-1 / +1 lines)
Lines 19-25 Link Here
19
19
20
<h2>Adding Events</h2>
20
<h2>Adding Events</h2>
21
21
22
<p>Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one branch or all branches. To add events, simply</p>
22
<p>Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one library or all libraries. To add events, simply</p>
23
23
24
<ul>
24
<ul>
25
	<li>Click on the date on the calendar that you would like to apply the closing to</li>
25
	<li>Click on the date on the calendar that you would like to apply the closing to</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/import_borrowers.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
	<li>Choose your CSV file and choose to match on 'Cardnumber' to prevent adding of duplicate card numbers to the system</li>
44
	<li>Choose your CSV file and choose to match on 'Cardnumber' to prevent adding of duplicate card numbers to the system</li>
45
	<li>Next you can choose default values to apply to all patrons you are importing
45
	<li>Next you can choose default values to apply to all patrons you are importing
46
<ul>
46
<ul>
47
	<li>ex. If you're importing patrons specific to one branch you can use the field on the Import form to apply the branch code to all those you are importing.</li>
47
	<li>ex. If you're importing patrons specific to one library you can use the field on the Import form to apply the branchcode to all those you are importing.</li>
48
</ul>
48
</ul>
49
</li>
49
</li>
50
	<li>Finally you need to decide on what data you want to replace if there are duplicates.
50
	<li>Finally you need to decide on what data you want to replace if there are duplicates.
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt (-1 / +1 lines)
Lines 37-43 Link Here
37
                    [% INCLUDE 'labels-batches-toolbar.inc' %]
37
                    [% INCLUDE 'labels-batches-toolbar.inc' %]
38
                    <div class="yui-g">
38
                    <div class="yui-g">
39
                        <div class="yui-u first" id="manage-label-batches">
39
                        <div class="yui-u first" id="manage-label-batches">
40
                            <div class="hint">Current Branch: [% LoginBranchname %]</div>
40
                            <div class="hint">Current Library: [% LoginBranchname %]</div>
41
                            <form name="add_by_barcode" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
41
                            <form name="add_by_barcode" action="/cgi-bin/koha/labels/label-edit-batch.pl" method="post">
42
                                <div>
42
                                <div>
43
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
43
                                    <fieldset class="rows" style="border-bottom: 0px; border: 0px;">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tt (-1 / +1 lines)
Lines 95-101 Link Here
95
                    [% INCLUDE 'labels-toolbar.inc' %]
95
                    [% INCLUDE 'labels-toolbar.inc' %]
96
                    <div class="yui-gc">
96
                    <div class="yui-gc">
97
                        <div class="yui-u first" id="manage-label-layouts">
97
                        <div class="yui-u first" id="manage-label-layouts">
98
                            <div class="hint">Current Branch: [% LoginBranchname %]</div>
98
                            <div class="hint">Current Library: [% LoginBranchname %]</div>
99
                            [% IF ( table_loop ) %]
99
                            [% IF ( table_loop ) %]
100
                            <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element %]">
100
                            <form name="layouts" action="/cgi-bin/koha/label-manage.pl?label_element=[% label_element %]">
101
                            <h2>Currently Available [% label_element_title %]</h2>
101
                            <h2>Currently Available [% label_element_title %]</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt (-1 / +1 lines)
Lines 37-43 Link Here
37
                    [% INCLUDE 'error-messages.inc' %]
37
                    [% INCLUDE 'error-messages.inc' %]
38
                    <div class="yui-g">
38
                    <div class="yui-g">
39
                        <div class="yui-u first" id="manage-patroncard-batches">
39
                        <div class="yui-u first" id="manage-patroncard-batches">
40
                            <div class="hint">Current Branch: [% LoginBranchname %]</div>
40
                            <div class="hint">Current Library: [% LoginBranchname %]</div>
41
                                [% IF ( table_loop ) %]
41
                                [% IF ( table_loop ) %]
42
                                <form name="items" class="checkboxed">
42
                                <form name="items" class="checkboxed">
43
                                    <h2>Items in batch number [% batch_id %]</h2>
43
                                    <h2>Items in batch number [% batch_id %]</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/manage.tt (-1 / +1 lines)
Lines 133-139 Link Here
133
                    [% INCLUDE 'error-messages.inc' %]
133
                    [% INCLUDE 'error-messages.inc' %]
134
                    <div class="yui-gc">
134
                    <div class="yui-gc">
135
                        <div class="yui-u first" id="manage-patroncards-layouts">
135
                        <div class="yui-u first" id="manage-patroncards-layouts">
136
                            <div class="hint">Current Branch: [% LoginBranchname %]</div>
136
                            <div class="hint">Current Library: [% LoginBranchname %]</div>
137
                            [% IF ( table_loop ) %]
137
                            [% IF ( table_loop ) %]
138
                            <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element %]">
138
                            <form name="layouts" action="/cgi-bin/koha/manage.pl?card_element=[% card_element %]">
139
                            <h2>Currently Available [% card_element_title %]</h2>
139
                            <h2>Currently Available [% card_element_title %]</h2>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_by_borrower_category.tt (-2 / +2 lines)
Lines 60-66 Link Here
60
        <option value="[% loopcategorie.value %]" >[% loopcategorie.description %] </option>  
60
        <option value="[% loopcategorie.value %]" >[% loopcategorie.description %] </option>  
61
     [% END %] 
61
     [% END %] 
62
    </select></li>
62
    </select></li>
63
		<li><label for="branch">Select a branch:</label> [% CGIbranch %]</li></ol></fieldset>
63
		<li><label for="branch">Select a library:</label> [% CGIbranch %]</li></ol></fieldset>
64
		<fieldset class="action"><input type="submit" value="Submit" />
64
		<fieldset class="action"><input type="submit" value="Submit" />
65
		<input type="hidden" name="report_name" value="[% report_name %]" />
65
		<input type="hidden" name="report_name" value="[% report_name %]" />
66
		<input type="hidden" name="do_it" value="1" /></fieldset>
66
		<input type="hidden" name="do_it" value="1" /></fieldset>
Lines 73-76 Link Here
73
[% INCLUDE 'reports-menu.inc' %]
73
[% INCLUDE 'reports-menu.inc' %]
74
</div>
74
</div>
75
</div>
75
</div>
76
[% INCLUDE 'intranet-bottom.inc' %]
76
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt (-2 / +2 lines)
Lines 275-281 Link Here
275
            </td> 
275
            </td> 
276
        </tr>
276
        </tr>
277
        [% END %]
277
        [% END %]
278
        <tr><td>Home branch</td>
278
        <tr><td>Home library</td>
279
            <td><input type="radio" name="Line" value="items.homebranch" /></td>
279
            <td><input type="radio" name="Line" value="items.homebranch" /></td>
280
            <td><input type="radio" name="Column" value="items.homebranch" /></td>
280
            <td><input type="radio" name="Column" value="items.homebranch" /></td>
281
            <td><select name="Filter" id="homebranch">
281
            <td><select name="Filter" id="homebranch">
Lines 287-293 Link Here
287
            </td>
287
            </td>
288
        </tr>
288
        </tr>
289
289
290
        <tr><td>Holding branch</td>
290
        <tr><td>Holding library</td>
291
            <td><input type="radio" name="Line" value="items.holdingbranch" /></td>
291
            <td><input type="radio" name="Line" value="items.holdingbranch" /></td>
292
            <td><input type="radio" name="Column" value="items.holdingbranch" /></td>
292
            <td><input type="radio" name="Column" value="items.holdingbranch" /></td>
293
            <td><select name="Filter" id="holdingbranch">
293
            <td><select name="Filter" id="holdingbranch">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt (-2 / +2 lines)
Lines 37-43 Link Here
37
        <th>Rep.Price</th>
37
        <th>Rep.Price</th>
38
        <th>Library</th>
38
        <th>Library</th>
39
        <th>Itemtype</th>
39
        <th>Itemtype</th>
40
        <th>Holdingbranch</th>
40
        <th>Current location</th>
41
        <th>Location</th>
41
        <th>Location</th>
42
        <th>Notes</th>
42
        <th>Notes</th>
43
    </tr>
43
    </tr>
Lines 75-81 Link Here
75
        <option value=""> --- </option>
75
        <option value=""> --- </option>
76
        <option value="title">Title</option>
76
        <option value="title">Title</option>
77
        <option value="author">Author</option>
77
        <option value="author">Author</option>
78
        <option value="homebranch">Library</option>
78
        <option value="homebranch">Home library</option>
79
        <option value="itype">Itemtypes</option>
79
        <option value="itype">Itemtypes</option>
80
        <option value="barcode">Barcode</option>
80
        <option value="barcode">Barcode</option>
81
        <option value="price">Price</option>
81
        <option value="price">Price</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt (-2 / +2 lines)
Lines 74-83 Link Here
74
			    </select>
74
			    </select>
75
			</li><li>
75
			</li><li>
76
		    	<label for="branch">
76
		    	<label for="branch">
77
					Branch:
77
					Library:
78
		    	</label>
78
		    	</label>
79
		    	<select name="branchcode"  id="branchcode">
79
		    	<select name="branchcode"  id="branchcode">
80
		    		<option value="">Any Branch</option>
80
		    		<option value="">Any library</option>
81
    				[% FOREACH branche IN branches %]
81
    				[% FOREACH branche IN branches %]
82
						<option value="[% branche.branchcode %]">[% branche.branchname %]</option>
82
						<option value="[% branche.branchcode %]">[% branche.branchname %]</option>
83
					[% END %]
83
					[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt (-2 / +2 lines)
Lines 214-220 Link Here
214
	<li>
214
	<li>
215
	    <label for="titlefilter">Title : </label>
215
	    <label for="titlefilter">Title : </label>
216
	    <input id="titlefilter" type="text" />
216
	    <input id="titlefilter" type="text" />
217
	    <label for="branchfilter">Branch: </label>
217
	    <label for="branchfilter">Library: </label>
218
	    <select id="branchfilter" onchange="filterByBranch();">
218
	    <select id="branchfilter" onchange="filterByBranch();">
219
            [% FOREACH branchloo IN branchloop %]
219
            [% FOREACH branchloo IN branchloop %]
220
                [% IF ( branchloo.selected ) %]
220
                [% IF ( branchloo.selected ) %]
Lines 271-277 Link Here
271
                    <th><input type="checkbox" id="CheckAll"></th>
271
                    <th><input type="checkbox" id="CheckAll"></th>
272
                    [% END %]
272
                    [% END %]
273
                    <th>Vendor</th>
273
                    <th>Vendor</th>
274
                    <th>Branch</th>
274
                    <th>Library</th>
275
                    <th>Title</th>
275
                    <th>Title</th>
276
                    <th>Issue number</th>
276
                    <th>Issue number</th>
277
                    <th>Status</th>
277
                    <th>Status</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt (-1 / +1 lines)
Lines 208-214 $(document).ready(function() { Link Here
208
                </th>
208
                </th>
209
                <th>Notes
209
                <th>Notes
210
                </th>
210
                </th>
211
                <th>Branch
211
                <th>Library
212
                </th>
212
                </th>
213
                [% IF ( routing ) %]<th>Routing</th>[% END %]
213
                [% IF ( routing ) %]<th>Routing</th>[% END %]
214
                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
214
                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-3 / +3 lines)
Lines 76-84 $(document).ready(function(){ Link Here
76
        <fieldset class="rows">
76
        <fieldset class="rows">
77
        <legend>Select items you want to check</legend>
77
        <legend>Select items you want to check</legend>
78
        <ol><li>
78
        <ol><li>
79
        <label for="branch">Branch</label>
79
        <label for="branch">Library</label>
80
            <input type="radio" name="branch" value="homebranch">Home Branch</input>
80
            <input type="radio" name="branch" value="homebranch">Home library</input>
81
            <input type="radio" name="branch" value="holdingbranch">Holding Branch</input>
81
            <input type="radio" name="branch" value="holdingbranch">Current location</input>
82
        </li><li>
82
        </li><li>
83
        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
83
        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
84
            <option value="">All Locations</option>
84
            <option value="">All Locations</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-2 / +2 lines)
Lines 163-169 $(document).ready(function() { Link Here
163
        [% END %]
163
        [% END %]
164
        <table id="lettert">
164
        <table id="lettert">
165
		<thead><tr>
165
		<thead><tr>
166
			<th>Branch</th>
166
			<th>Library</th>
167
			<th>Module</th>
167
			<th>Module</th>
168
			<th>Code</th>
168
			<th>Code</th>
169
			<th>Name</th>
169
			<th>Name</th>
Lines 338-344 $(document).ready(function() { Link Here
338
	<table>
338
	<table>
339
        <thead>
339
        <thead>
340
		<tr>
340
		<tr>
341
			<th>Branch</th>
341
			<th>Library</th>
342
			<th>Module</th>
342
			<th>Module</th>
343
			<th>Code</th>
343
			<th>Code</th>
344
			<th>Name</th>
344
			<th>Name</th>
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2OAIDC.xsl (-1 / +1 lines)
Lines 172-178 Link Here
172
       <dc:identifier>
172
       <dc:identifier>
173
      <xsl:text>LOC:</xsl:text>
173
      <xsl:text>LOC:</xsl:text>
174
      <xsl:choose>
174
      <xsl:choose>
175
        <xsl:when test="marc:subfield[@code='c']='MAIN'">Main Branch</xsl:when>
175
        <xsl:when test="marc:subfield[@code='c']='MAIN'">Main library</xsl:when>
176
        <xsl:when test="marc:subfield[@code='c']='BIB2'">Library 2</xsl:when>
176
        <xsl:when test="marc:subfield[@code='c']='BIB2'">Library 2</xsl:when>
177
      </xsl:choose>
177
      </xsl:choose>
178
      <xsl:foreach select="marc:subfield[@code='k']">
178
      <xsl:foreach select="marc:subfield[@code='k']">
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc (-2 / +2 lines)
Lines 15-21 Link Here
15
				<li>
15
				<li>
16
               <label for="branch">From: </label>
16
               <label for="branch">From: </label>
17
                <select name="branch" id="branch" style="width: 10em;">
17
                <select name="branch" id="branch" style="width: 10em;">
18
                <option value="">All branches</option>
18
                <option value="">All libraries</option>
19
                [% FOREACH branchloo IN branchloop %]
19
                [% FOREACH branchloo IN branchloop %]
20
                    [% IF ( branch == branchname ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
20
                    [% IF ( branch == branchname ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
21
                        [% branchloo.branchname %]
21
                        [% branchloo.branchname %]
Lines 44-47 Link Here
44
		
44
		
45
    </fieldset><fieldset class="action"><input type="submit" value="Submit" /></fieldset>
45
    </fieldset><fieldset class="action"><input type="submit" value="Submit" /></fieldset>
46
    </form>
46
    </form>
47
</div>
47
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-2 / +2 lines)
Lines 556-562 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
556
    <table id="serialcollectiont">
556
    <table id="serialcollectiont">
557
	<thead>
557
	<thead>
558
	    <tr>
558
	    <tr>
559
		<th>Branch</th>
559
		<th>Library</th>
560
		<th>Serial collection</th>
560
		<th>Serial collection</th>
561
	    </tr>
561
	    </tr>
562
	</thead>
562
	</thead>
Lines 780-786 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
780
    <p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>
780
    <p>There are [% subscriptionsnumber %] subscription(s) associated with this title.</p>
781
    [% FOREACH subscription IN subscriptions %]
781
    [% FOREACH subscription IN subscriptions %]
782
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
782
    [% IF ( subscription.branchname ) %]<h3>At library: [% subscription.branchname %]</h3>[% ELSE %]
783
    [% IF ( subscription.branchcode ) %]<h3>At branch: [% subscription.branchcode %]</h3>[% END %][% END %]
783
    [% IF ( subscription.branchcode ) %]<h3>At library: [% subscription.branchcode %]</h3>[% END %][% END %]
784
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
784
    [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes %] </p>[% END %]
785
    <p>Subscription from: [% subscription.histstartdate %]  to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate %] [% ELSE %] now (current)[% END %]</p>
785
    <p>Subscription from: [% subscription.histstartdate %]  to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate %] [% ELSE %] now (current)[% END %]</p>
786
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
786
    [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist %] </p>[% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tt (-1 / +1 lines)
Lines 92-98 $.tablesorter.addParser({ Link Here
92
        [% END %]
92
        [% END %]
93
        </select> </li>
93
        </select> </li>
94
    [% IF ( branch_loop ) %]
94
    [% IF ( branch_loop ) %]
95
    <li><label for="branch">Branch:</label>
95
    <li><label for="branch">Library:</label>
96
        <select name="branch" id="branch">
96
        <select name="branch" id="branch">
97
        [% FOREACH branch_loo IN branch_loop %]
97
        [% FOREACH branch_loo IN branch_loop %]
98
            [% IF ( branch_loo.selected ) %]
98
            [% IF ( branch_loo.selected ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tt (-1 / +1 lines)
Lines 100-106 function Dopop(link) { Link Here
100
				<li>
100
				<li>
101
               <label for="branch">From: </label>
101
               <label for="branch">From: </label>
102
                <select name="branch" id="branch">
102
                <select name="branch" id="branch">
103
                <option value="">All branches</option>
103
                <option value="">All libraries</option>
104
                [% FOREACH branchloo IN branchloop %]
104
                [% FOREACH branchloo IN branchloop %]
105
                    [% IF ( branchloo.selected ) %]
105
                    [% IF ( branchloo.selected ) %]
106
                        <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
106
                        <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tt (-2 / +1 lines)
Lines 45-51 Card Number:</th><td>[% cardnumber %]</td></tr> Link Here
45
45
46
<tr><th scope="row">Expires:</th><td>[% dateexpiry %]</td></tr>
46
<tr><th scope="row">Expires:</th><td>[% dateexpiry %]</td></tr>
47
47
48
[% IF ( joiningbranch ) %]<tr><th>Joining Branch:</th><td>[% joiningbranch %]</td></tr>[% ELSE %]&nbsp;[% END %]</table>
48
[% IF ( joiningbranch ) %]<tr><th>Joining library:</th><td>[% joiningbranch %]</td></tr>[% ELSE %]&nbsp;[% END %]</table>
49
49
50
<table>
50
<table>
51
<caption>Identity Details</caption>
51
<caption>Identity Details</caption>
52
- 

Return to bug 7731