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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 371-373 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' Link Here
371
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
371
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('SuspendHoldsOpac', '1', NULL , 'Allow holds to be suspended from the OPAC.', 'YesNo');
372
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('DefaultLanguageField008','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)','','Free');
372
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('DefaultLanguageField008','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)','','Free');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACShowBarcode','0','Show items barcode in holding tab','','YesNo');
373
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OPACShowBarcode','0','Show items barcode in holding tab','','YesNo');
374
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free');
(-)a/installer/data/mysql/updatedatabase.pl (-1 / +8 lines)
Lines 5392-5398 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5392
    SetVersion ($DBversion);
5392
    SetVersion ($DBversion);
5393
}
5393
}
5394
5394
5395
$DBversion = "XXX";
5395
<<<<<<< HEAD
5396
$DBversion = "3.09.00.018";
5396
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
5397
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
5397
    $dbh->do("DROP TABLE IF EXISTS aqbudgetborrowers");
5398
    $dbh->do("DROP TABLE IF EXISTS aqbudgetborrowers");
5398
    $dbh->do("
5399
    $dbh->do("
Lines 5413-5418 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
5413
        VALUES (11, 'budget_manage_all', 'Manage all budgets')
5414
        VALUES (11, 'budget_manage_all', 'Manage all budgets')
5414
    ");
5415
    ");
5415
    print "Upgrade to $DBversion done (Add aqbudgetborrowers table)\n";
5416
    print "Upgrade to $DBversion done (Add aqbudgetborrowers table)\n";
5417
=======
5418
$DBversion ="XXX";
5419
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5420
    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('IntranetSlipPrinterJS','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','','Free')");
5421
    print "Upgrade to $DBversion done (Add system preference IntranetSlipPrinterJS))\n";
5422
>>>>>>> Bug 7563 [ENH] - Silent print slips using Firefox PlugIn jsPrintSetup and new staff client preference
5416
    SetVersion($DBversion);
5423
    SetVersion($DBversion);
5417
}
5424
}
5418
5425
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref (+5 lines)
Lines 16-21 Staff Client: Link Here
16
              class: url
16
              class: url
17
            - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with <code>http://</code>.)
17
            - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with <code>http://</code>.)
18
        -
18
        -
19
            - "Use the following JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/:"
20
            - pref: IntranetSlipPrinterJS
21
              type: textarea
22
              class: code
23
        -
19
            - "Include the following CSS on all pages in the staff client:"
24
            - "Include the following CSS on all pages in the staff client:"
20
            - pref: IntranetUserCSS
25
            - pref: IntranetUserCSS
21
              type: textarea
26
              type: textarea
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt (-4 / +8 lines)
Lines 8-17 Link Here
8
[% END %]
8
[% END %]
9
9
10
<script language="javascript">
10
<script language="javascript">
11
    function printThenClose() {
11
[% IF ( IntranetSlipPrinterJS ) %]
12
        window.print();
12
    [% IntranetSlipPrinterJS %]
13
        window.close();
13
[% ELSE %]
14
    }
14
     function printThenClose() {
15
         window.print();
16
         window.close();
17
     }
18
[% END %]
15
</script>
19
</script>
16
</head>
20
</head>
17
<body id="circ_printslip" class="circ" onload="printThenClose();">
21
<body id="circ_printslip" class="circ" onload="printThenClose();">
(-)a/kohaversion.pl (-1 / +1 lines)
Lines 16-22 the kohaversion is divided in 4 parts : Link Here
16
use strict;
16
use strict;
17
17
18
sub kohaversion {
18
sub kohaversion {
19
    our $VERSION = '3.09.00.017';
19
    our $VERSION = '3.09.00.018';
20
    # version needs to be set this way
20
    # version needs to be set this way
21
    # so that it can be picked up by Makefile.PL
21
    # so that it can be picked up by Makefile.PL
22
    # during install
22
    # during install
(-)a/members/printslip.pl (-1 / +2 lines)
Lines 89-92 $template->param( Link Here
89
    error           => $error,
89
    error           => $error,
90
);
90
);
91
91
92
$template->param( IntranetSlipPrinterJS => C4::Context->preference('IntranetSlipPrinterJS' ) );
93
92
output_html_with_http_headers $input, $cookie, $template->output;
94
output_html_with_http_headers $input, $cookie, $template->output;
93
- 

Return to bug 7563