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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-5 / +5 lines)
Lines 1-4 Link Here
1
[% USE KohaBranchName %]
1
[% USE BranchName %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
3
<title>Koha &rsaquo; Basket grouping for [% booksellername |html %]</title>
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
Lines 275-282 function submitForm(form) { Link Here
275
												[% END %]
275
												[% END %]
276
						</td>
276
						</td>
277
                                    <td>[% basketgroup.id %]</td>
277
                                    <td>[% basketgroup.id %]</td>
278
                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
278
                                    <td>[% basketgroup.billingplace | $BranchName %]</td>
279
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
279
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $BranchName %][% END %]</td>
280
                                    <td>[% basketgroup.basketsqty %]</td>
280
                                    <td>[% basketgroup.basketsqty %]</td>
281
							<td>
281
							<td>
282
								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
282
								<input type="button" onclick="closeandprint([% basketgroup.id %])" value="Close and print" />
Lines 313-320 function submitForm(form) { Link Here
313
										[% END %]
313
										[% END %]
314
					</td>
314
					</td>
315
                                    <td>[% basketgroup.id %]</td>
315
                                    <td>[% basketgroup.id %]</td>
316
                                    <td>[% basketgroup.billingplace | $KohaBranchName %]</td>
316
                                    <td>[% basketgroup.billingplace | $BranchName %]</td>
317
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $KohaBranchName %][% END %]</td>
317
                                    <td>[% IF (basketgroup.freedeliveryplace) %]Free delivery place[% ELSE %][% basketgroup.deliveryplace | $BranchName %][% END %]</td>
318
                                    <td>[% basketgroup.basketsqty %]</td>
318
                                    <td>[% basketgroup.basketsqty %]</td>
319
					<td>
319
					<td>
320
							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
320
							<form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id %]" /><input type="submit" value="Reopen" /></form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 1-4 Link Here
1
[% USE KohaBranchName %]
1
[% USE BranchName %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
3
[% IF ( export_remove_fields OR export_with_csv_profile ) %]
4
   [% SET exports_enabled = 1 %]
4
   [% SET exports_enabled = 1 %]
Lines 547-553 function validate1(date) { Link Here
547
        [% END %]
547
        [% END %]
548
548
549
        [% IF ( ITEMNOTSAMEBRANCH ) %]
549
        [% IF ( ITEMNOTSAMEBRANCH ) %]
550
            <li>This item belongs to [% itemhomebranch | $KohaBranchName %] and cannot be checked out from this location.</li>
550
            <li>This item belongs to [% itemhomebranch | $BranchName %] and cannot be checked out from this location.</li>
551
        [% END %]
551
        [% END %]
552
552
553
        [% IF ( USERBLOCKEDREMAINING ) %]
553
        [% IF ( USERBLOCKEDREMAINING ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-2 / +2 lines)
Lines 1-4 Link Here
1
[% USE KohaBranchName %]
1
[% USE BranchName %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
3
<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
Lines 102-108 $(document).ready(function() { Link Here
102
        <li><span class="label">Librarian identity:</span> [% librarian %]</li>
102
        <li><span class="label">Librarian identity:</span> [% librarian %]</li>
103
        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid %]">[% aqbooksellername %]</a></li>
103
        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid %]">[% aqbooksellername %]</a></li>
104
        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% bibnum %]">[% bibliotitle %]</a> <i>([% bibnum %])</i></li>
104
        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% bibnum %]">[% bibliotitle %]</a> <i>([% bibnum %])</i></li>
105
[% IF ( branchcode ) %]<li><span class="label">Library:</span> [% branchcode | $KohaBranchName %]</li>[% END %]
105
[% IF ( branchcode ) %]<li><span class="label">Library:</span> [% branchcode | $BranchName %]</li>[% END %]
106
        [% IF ( serialsadditems ) %]
106
        [% IF ( serialsadditems ) %]
107
            <li><span class="label">Items:</span> Serial receipt creates an item record.</li>
107
            <li><span class="label">Items:</span> Serial receipt creates an item record.</li>
108
        [% ELSE %]
108
        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (-8 / +8 lines)
Lines 1-5 Link Here
1
[% USE KohaAuthorisedValues %]
1
[% USE KohaAuthorisedValues %]
2
[% USE KohaBranchName %]
2
[% USE BranchName %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Acquisitions  &rsaquo;
4
<title>Koha &rsaquo; Acquisitions  &rsaquo;
5
    [% IF ( op_save ) %]
5
    [% IF ( op_save ) %]
Lines 226-243 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
226
            <tr>
226
            <tr>
227
                <th><span class="label">Suggestion creation</span> </th>
227
                <th><span class="label">Suggestion creation</span> </th>
228
                <td>[% suggesteddate %]</td>
228
                <td>[% suggesteddate %]</td>
229
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
229
                <td>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $BranchName %] ([% suggestedby_description %])[% END %]
230
                </td>
230
                </td>
231
            </tr>
231
            </tr>
232
            <tr>
232
            <tr>
233
                <th><span class="label">Suggestion management</span> </th>
233
                <th><span class="label">Suggestion management</span> </th>
234
                <td>[% manageddate %]</td>
234
                <td>[% manageddate %]</td>
235
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
235
                <td>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $BranchName %] ([% managedby_description %])[% END %]</td>
236
            </tr>
236
            </tr>
237
            <tr>
237
            <tr>
238
                <th><span class="label">Suggestion accepted</span> </th>
238
                <th><span class="label">Suggestion accepted</span> </th>
239
                <td>[% accepteddate %]</td>
239
                <td>[% accepteddate %]</td>
240
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
240
                <td>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $BranchName %] ([% acceptedby_description %])[% END %]</td>
241
            </tr>
241
            </tr>
242
            </tbody>
242
            </tbody>
243
        </table></li></ol>
243
        </table></li></ol>
Lines 354-371 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
354
            <tr>
354
            <tr>
355
                <th><label for="suggesteddate">Suggestion creation</label> </th>
355
                <th><label for="suggesteddate">Suggestion creation</label> </th>
356
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
356
                <td><input type="text" id="suggesteddate" name="suggesteddate" size="10" maxlength="10" value="[% suggesteddate %]"/></td>
357
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $KohaBranchName %] ([% suggestedby_description %])[% END %]
357
                <td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber %]">[% suggestedby_surname %], [% suggestedby_firstname %]</a>  [% suggestedby_branchcode | $BranchName %] ([% suggestedby_description %])[% END %]
358
                </td>
358
                </td>
359
            </tr>
359
            </tr>
360
            <tr>
360
            <tr>
361
                <th><label for="managedon">Suggestion management</label> </th>
361
                <th><label for="managedon">Suggestion management</label> </th>
362
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
362
                <td><input type="text" id="managedon" name="manageddate" size="10" maxlength="10" value="[% manageddate %]" /></td>
363
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $KohaBranchName %] ([% managedby_description %])[% END %]</td>
363
                <td><input type="hidden" id="managedby" name="managedby" value="[% managedby %]"/>[% IF ( managedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber %]">[% managedby_surname %], [% managedby_firstname %]</a> [% managedby_branchcode | $BranchName %] ([% managedby_description %])[% END %]</td>
364
            </tr>
364
            </tr>
365
            <tr>
365
            <tr>
366
                <th><label for="accepteddate">Suggestion accepted</label> </th>
366
                <th><label for="accepteddate">Suggestion accepted</label> </th>
367
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
367
                <td><input type="text" id="accepteddate" name="accepteddate" size="10" maxlength="10" value="[% accepteddate %]" /></td>
368
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $KohaBranchName %] ([% acceptedby_description %])[% END %]</td>
368
                <td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber %]">[% acceptedby_surname %], [% acceptedby_firstname %]</a> [% acceptedby_branchcode | $BranchName %] ([% acceptedby_description %])[% END %]</td>
369
            </tr>
369
            </tr>
370
            </tbody>
370
            </tbody>
371
        </table></li></ol>
371
        </table></li></ol>
Lines 482-488 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
482
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
482
                    [% IF ( suggestions_loo.manageddate ) %] - [% suggestions_loo.manageddate %][% END %]
483
                </td>
483
                </td>
484
                <td>
484
                <td>
485
                    [% suggestions_loo.branchcode | $KohaBranchName %]
485
                    [% suggestions_loo.branchcode | $BranchName %]
486
                </td>
486
                </td>
487
                <td>
487
                <td>
488
                    [% suggestions_loo.budget_name %]
488
                    [% suggestions_loo.budget_name %]
(-)a/t/db_dependent/Koha_template_plugin_KohaBranchName.t (-4 / +3 lines)
Lines 21-31 use Modern::Perl; Link Here
21
use Test::More tests => 5;
21
use Test::More tests => 5;
22
22
23
BEGIN {
23
BEGIN {
24
    use_ok('Koha::Template::Plugin::KohaBranchName');
24
    use_ok('Koha::Template::Plugin::BranchName');
25
}
25
}
26
26
27
my $filter = Koha::Template::Plugin::KohaBranchName->new();
27
my $filter = Koha::Template::Plugin::BranchName->new();
28
ok($filter, "initialized KohaBranchName plugin");
28
ok($filter, "initialized BranchName plugin");
29
29
30
my $name = $filter->filter('CPL');
30
my $name = $filter->filter('CPL');
31
is($name, 'Centerville', 'retrieved expected name for CPL');
31
is($name, 'Centerville', 'retrieved expected name for CPL');
32
- 

Return to bug 8004