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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 348-350 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
348
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CatalogModuleRelink',0,'If OFF the linker will never replace the authids that are set in the cataloging module.',NULL,'YesNo');
348
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('CatalogModuleRelink',0,'If OFF the linker will never replace the authids that are set in the cataloging module.',NULL,'YesNo');
349
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelay',  '0',  '',  'Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay',  'YesNo');
349
INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelay',  '0',  '',  'Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay',  'YesNo');
350
INSERT INTO systempreferences` (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelayCharge', '0', NULL , 'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.',  'free')
350
INSERT INTO systempreferences` (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelayCharge', '0', NULL , 'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.',  'free')
351
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RoutingListNote','To change this note edit <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutlingListNote</a> system preference.','Define a note to be shown on all routing lists','70|10','Textarea');
(-)a/installer/data/mysql/updatedatabase.pl (+6 lines)
Lines 4889-4894 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4889
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelayCharge', '0', NULL , 'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.',  'free')");
4889
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelayCharge', '0', NULL , 'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.',  'free')");
4890
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelay', '0', '', 'Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay', 'YesNo')");
4890
    $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelay', '0', '', 'Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay', 'YesNo')");
4891
    print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reseves.charge_if_expired)\n";
4891
    print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reseves.charge_if_expired)\n";
4892
}
4893
4894
$DBversion = "3.07.00.XXX";
4895
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4896
    $dbh->do(q{INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RoutingListNote','To change this note edit <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RoutingListNote#jumped">RoutlingListNote</a> system preference.','Define a note to be shown on all routing lists','70|10','Textarea');});
4897
    print "Upgrade to $DBversion done (Added system preference RoutingListNote for adding a general note to all routing lists.)\n";
4892
    SetVersion($DBversion);
4898
    SetVersion($DBversion);
4893
}
4899
}
4894
4900
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref (+5 lines)
Lines 26-31 Serials: Link Here
26
              no: "Don't place"
26
              no: "Don't place"
27
        - received serials on hold if they are on a routing list.
27
        - received serials on hold if they are on a routing list.
28
    -
28
    -
29
        - 'Include following note on all routing lists:'
30
        - pref: RoutingListNote
31
          type: textarea
32
          class: code
33
    -
29
        - Show the
34
        - Show the
30
        - pref: StaffSerialIssueDisplayCount
35
        - pref: StaffSerialIssueDisplayCount
31
          class: integer
36
          class: integer
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tt (-13 / +23 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Serials  &rsaquo; Routing Slip Preview</title>
2
<title>Koha &rsaquo; Serials  &rsaquo; Routing slip preview</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
4
5
<style type="text/css">
5
<style type="text/css">
Lines 13-33 Link Here
13
13
14
<div id="custom-doc" class="yui-t7">
14
<div id="custom-doc" class="yui-t7">
15
   <div id="bd">
15
   <div id="bd">
16
	
17
16
18
<table>
17
<table>
19
<tr><td colspan="3"><h3>[% libraryname %]</h3></td></tr>
18
    <tr>
20
<tr><td colspan="3"><b>Title:</b> [% title |html %]<br />
19
        <td colspan="2"><h3>[% libraryname %]</h3></td>
21
[% issue %]</td></tr>
20
    </tr>
22
<tr><td><b>Name</b></td>
21
    <tr>
23
    <td><b>Date Due</b></td></tr>
22
        <td colspan="2"><b>Title:</b> [% title |html %]<br />[% issue %]</td>
24
[% FOREACH memberloo IN memberloop %]
23
    </tr>
25
        <tr><td>[% memberloo.name %]</td>
24
    <tr>
26
            <td>&nbsp;</td></tr>
25
        <td><b>Name</b></td>
27
[% END %]
26
        <td><b>Date due</b></td>
27
    </tr>
28
    [% FOREACH memberloo IN memberloop %]
29
    <tr>
30
        <td>[% memberloo.name %]</td>
31
        <td>&nbsp;</td>
32
    </tr>
33
    [% END %]
28
</table>
34
</table>
29
<p><b>Notes:</b> Please return this item promptly as others are waiting for it.
35
30
<br />[% routingnotes %]</p>
36
<div id="routingnotes">
37
    <p id="generalroutingnote">[% generalroutingnote %]</p>
38
    <p id="routingnote">[% routingnotes %]</p>
39
</div>
40
31
   <div id="slip-block-links" class="noprint">
41
   <div id="slip-block-links" class="noprint">
32
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
42
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
33
   </div>
43
   </div>
(-)a/serials/routing-preview.pl (-1 / +1 lines)
Lines 131-136 $template->param( Link Here
131
    subscriptionid => $subscriptionid,
131
    subscriptionid => $subscriptionid,
132
    memberloop => $memberloop,
132
    memberloop => $memberloop,
133
    routingnotes => $routingnotes,
133
    routingnotes => $routingnotes,
134
    generalroutingnote => C4::Context->preference('RoutingListNote'),
134
    hasRouting => check_routing($subscriptionid),
135
    hasRouting => check_routing($subscriptionid),
135
    );
136
    );
136
137
137
- 

Return to bug 7557