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

(-)a/installer/data/mysql/atomicupdate/bug_8352.sql (-3 / +3 lines)
Lines 1-12 Link Here
1
ALTER TABLE reserves ADD printed DATETIME NULL AFTER suspend_until;
1
ALTER TABLE reserves ADD printed DATETIME NULL AFTER suspend_until;
2
ALTER TABLE old_reserves ADD printed DATETIME NULL AFTER suspend_until;
2
ALTER TABLE old_reserves ADD printed DATETIME NULL AFTER suspend_until;
3
3
4
INSERT INTO  letter ( module, code,  branchcode, name, is_html, title, content ) VALUES (
4
INSERT INTO  letter ( module, code,  branchcode, name, is_html, title, content, message_transport_type ) VALUES (
5
    'reserves',  'HOLD_PLACED_PRINT',  '',  'Hold Placed ( Auto-Print )',  '0',  'Hold Placed ( Auto-Print )',  'Hold to pull at <<branches.branchname>>
5
    'reserves',  'HOLDPLACED',  '',  'Hold Placed ( Auto-Print )',  '0',  'Hold Placed ( Auto-Print )',  'Hold to pull at <<branches.branchname>>
6
6
7
For <<borrowers.firstname>> <<borrowers.surname>> ( <<borrowers.cardnumber>> )
7
For <<borrowers.firstname>> <<borrowers.surname>> ( <<borrowers.cardnumber>> )
8
8
9
<<biblio.title>> by <<biblio.author>>');
9
<<biblio.title>> by <<biblio.author>>', 'print');
10
10
11
ALTER TABLE printers
11
ALTER TABLE printers
12
    DROP PRIMARY KEY,
12
    DROP PRIMARY KEY,
(-)a/installer/data/mysql/en/mandatory/sample_notices.sql (-2 / +3 lines)
Lines 162-166 VALUES ( 'circulation', 'OVERDUES_SLIP', '', 'Overdues Slip', '0', 'OVERDUES_SLI Link Here
162
162
163
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item>
163
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> Fine: <<items.fine>></item>
164
', 'print' );
164
', 'print' );
165
INSERT INTO `letter` (`module`,`code`,`branchcode`,`name`,`is_html`,`title`,`content`)
165
166
VALUES ('reserves', 'HOLD_PLACED_PRINT', 'Hold Placed ( Auto-Print )', 'Hold Placed ( Auto-Print )', 'Hold to pull at <<branches.branchname>>\r\nFor <<borrowers.firstname>> <<borrowers.surname>> ( <<borrowers.cardnumber>> )\r\n<<biblio.title>> by <<biblio.author>>');
166
INSERT INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type )
167
VALUES ('reserves', 'HOLDPLACED', 'Hold Placed ( Auto-Print )', 'Hold Placed ( Auto-Print )', 'Hold to pull at <<branches.branchname>>\r\nFor <<borrowers.firstname>> <<borrowers.surname>> ( <<borrowers.cardnumber>> )\r\n<<biblio.title>> by <<biblio.author>>', 'print');
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-toolbar.inc (-2 / +2 lines)
Lines 1-4 Link Here
1
<div id="toolbar" class="btn-toolbar">
1
<div id="toolbar" class="btn-toolbar">
2
        <div class="btn-group"><a class="btn btn-small" id="add_printer" href="#"><i class="icon-plus"></i> Add printer</a></div>
2
        <div class="btn-group"><a class="btn btn-small" id="add_printer" href="#"><i class="fa fa-plus"></i> Add printer</a></div>
3
        <div class="btn-group"><a class="btn btn-small" id="delete_printer" href="#"><i class="icon-remove"></i> Delete printer(s)</a></div>
3
        <div class="btn-group"><a class="btn btn-small" id="delete_printer" href="#"><i class="fa fa-trash"></i> Delete printer(s)</a></div>
4
</div>
4
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-1 / +1 lines)
Lines 106-112 Link Here
106
    <dt><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></dt>
106
    <dt><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></dt>
107
    <dd>Define your configured network printers</dd>
107
    <dd>Define your configured network printers</dd>
108
108
109
    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
109
    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
110
    <dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
110
    <dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
111
111
112
    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
112
    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt (-2 / +2 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Administration &rsaquo; Printer editor</title>
2
<title>Koha &rsaquo; Administration &rsaquo; Printers</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
[% INCLUDE 'datatables.inc' %]
5
[% INCLUDE 'datatables.inc' %]
Lines 147-153 $(document).ready(function() { Link Here
147
        if (!idsToDelete) {
147
        if (!idsToDelete) {
148
            alert(_("No printers selected!"));
148
            alert(_("No printers selected!"));
149
        }
149
        }
150
        else if (confirm(_("Are you sure you wish to delete printer(s) ") + idsToDelete + "?")) {
150
        else if (confirm(_("Are you sure you wish to delete printer(s) %s?").format(idsToDelete))) {
151
            oTable.$('.selected').each(function(){
151
            oTable.$('.selected').each(function(){
152
                    var printerID = $(this).attr('id');
152
                    var printerID = $(this).attr('id');
153
                        $.ajax({
153
                        $.ajax({
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/printers.tt (-3 / +3 lines)
Lines 8-14 Link Here
8
<p>Click on any field to edit the contents; Press the &lt;Enter&gt; key to save edit.</p>
8
<p>Click on any field to edit the contents; Press the &lt;Enter&gt; key to save edit.</p>
9
<p>Click on one or more printer IDs to select entire printers for deletion; Click the 'Delete printer(s)' button to delete selected printers.</p>
9
<p>Click on one or more printer IDs to select entire printers for deletion; Click the 'Delete printer(s)' button to delete selected printers.</p>
10
10
11
<p>Printers defined in this area can be used to print automatic reserve notices</p>
11
<p>Printers defined in this area can be used to print automatic hold notices</p>
12
12
13
<h2>How printers are defined</h2>
13
<h2>How printers are defined</h2>
14
<p>Printers can be utilized in two ways, either by sending the data directly to a networked printer via lpr, or by printing to a printer set up on the Koha server via CUPS.</p>
14
<p>Printers can be utilized in two ways, either by sending the data directly to a networked printer via lpr, or by printing to a printer set up on the Koha server via CUPS.</p>
Lines 25-34 Link Here
25
25
26
<h2>Caveats</h2>
26
<h2>Caveats</h2>
27
<p>
27
<p>
28
    Printing plain text is supported by both methods. When printing HTML, the output will be sent to the printer as PostScript. If you are printing via LPR, and you want to print HTML, you will need to ensure that your printer can recieve and print PostScript data.
28
    Printing plain text is supported by both methods. When printing HTML, the output will be sent to the printer as PostScript. If you are printing via LPR, and you want to print HTML, you will need to ensure that your printer can receive and print PostScript data.
29
</p>
29
</p>
30
<p>
30
<p>
31
    For printing slips and notices, this behavior can be controlled via the "HTML message" flag of the HOLD_PLACED_PRINT notice. Leaving this checkbox unchecked will result in plain text being printed, whereas checking this checkbox will result in HTML converted to PostScript being printed.
31
    For printing slips and notices, this behavior can be controlled via the "HTML message" flag of the HOLDPLACED print notice. Leaving this checkbox unchecked will result in plain text being printed, whereas checking this checkbox will result in HTML converted to PostScript being printed.
32
32
33
</p>
33
</p>
34
[% INCLUDE 'help-bottom.inc' %]
34
[% INCLUDE 'help-bottom.inc' %]
(-)a/misc/cronjobs/holds/print_holds.pl (-5 / +8 lines)
Lines 76-85 while ( my $hold = $holds->next() ) { Link Here
76
    my $borrower = Koha::Borrowers->find( $hold->borrowernumber );
76
    my $borrower = Koha::Borrowers->find( $hold->borrowernumber );
77
77
78
    my $letter = GetPreparedLetter(
78
    my $letter = GetPreparedLetter(
79
        module      => 'reserves',
79
        module                 => 'reserves',
80
        letter_code => 'HOLD_PLACED_PRINT',
80
        letter_code            => 'HOLDPLACED',
81
        branchcode  => $hold->branchcode,
81
        branchcode             => $hold->branchcode,
82
        tables      => {
82
        message_transport_type => 'print',
83
        tables                 => {
83
            branches    => $hold->branchcode,
84
            branches    => $hold->branchcode,
84
            biblio      => $hold->biblionumber,
85
            biblio      => $hold->biblionumber,
85
            biblioitems => $hold->biblionumber,
86
            biblioitems => $hold->biblionumber,
Lines 87-93 while ( my $hold = $holds->next() ) { Link Here
87
            borrowers   => $borrower->unblessed,
88
            borrowers   => $borrower->unblessed,
88
            reserves    => $hold->unblessed,
89
            reserves    => $hold->unblessed,
89
90
90
        }
91
        },
91
    );
92
    );
92
93
93
    if ( defined( $printers{ $hold->branchcode } ) ) {
94
    if ( defined( $printers{ $hold->branchcode } ) ) {
Lines 155-160 Run in test mode. Holds will not actually be printed. Link Here
155
156
156
Run in production mode. Holds will be printed to printers.
157
Run in production mode. Holds will be printed to printers.
157
158
159
=back
160
158
=head1 DESCRIPTION
161
=head1 DESCRIPTION
159
162
160
B<This program> will print on-demand notices for items in the holds queue as they appear.
163
B<This program> will print on-demand notices for items in the holds queue as they appear.
(-)a/svc/printer (-2 lines)
Lines 1-7 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
2
3
# Copyright 2014 ByWater Solutions
3
# Copyright 2014 ByWater Solutions
4
# Copyright 2012 Foundations Bible College Inc.
5
#
4
#
6
# This file is part of Koha.
5
# This file is part of Koha.
7
#
6
#
8
- 

Return to bug 8352