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

(-)a/circ/circulation.pl (-2 / +2 lines)
Lines 732-739 $template->param( Link Here
732
	AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
732
	AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
733
    dateformat                => C4::Context->preference("dateformat"),
733
    dateformat                => C4::Context->preference("dateformat"),
734
    DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar(),
734
    DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar(),
735
    dont_export_fields        => C4::Context->preference("DontExportFields"),
735
    export_remove_fields      => C4::Context->preference("ExportRemoveFields"),
736
    csv_profile_for_export    => C4::Context->preference("CsvProfileForExport"),
736
    export_with_csv_profile   => C4::Context->preference("ExportWithCsvProfile"),
737
    canned_bor_notes_loop     => $canned_notes,
737
    canned_bor_notes_loop     => $canned_notes,
738
);
738
);
739
739
(-)a/installer/data/mysql/updatedatabase.pl (-4 / +4 lines)
Lines 5687-5704 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
5687
$DBversion = "3.09.00.XXX";
5687
$DBversion = "3.09.00.XXX";
5688
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5688
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5689
    $dbh->do(qq{
5689
    $dbh->do(qq{
5690
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('DontExportFields','','List of fields for non export in circulation.pl (separated by a space)','','');
5690
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('ExportRemoveFields','','List of fields for non export in circulation.pl (separated by a space)','','');
5691
    });
5691
    });
5692
    print "Upgrade to $DBversion done (Add system preference DontExportFields)\n";
5692
    print "Upgrade to $DBversion done (Add system preference ExportRemoveFields)\n";
5693
    SetVersion($DBversion);
5693
    SetVersion($DBversion);
5694
}
5694
}
5695
5695
5696
$DBversion = "3.09.00.XXX";
5696
$DBversion = "3.09.00.XXX";
5697
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5697
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
5698
    $dbh->do(qq{
5698
    $dbh->do(qq{
5699
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('CsvProfileForExport','','Set a profile name for CSV export','','');
5699
        INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('ExportWithCsvProfile','','Set a profile name for CSV export','','');
5700
    });
5700
    });
5701
    print "Upgrade to $DBversion done (Adds New System preference CsvProfileForExport)\n";
5701
    print "Upgrade to $DBversion done (Adds New System preference ExportWithCsvProfile)\n";
5702
    SetVersion($DBversion)
5702
    SetVersion($DBversion)
5703
}
5703
}
5704
5704
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (-1 / +1 lines)
Lines 111-117 Circulation: Link Here
111
                  no: "Do not"
111
                  no: "Do not"
112
            - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
112
            - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
113
        -
113
        -
114
            - pref: DontExportFields
114
            - pref: ExportRemoveFields
115
            - choices:
115
            - choices:
116
                yes: Export
116
                yes: Export
117
                no: "Don't export"
117
                no: "Don't export"
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/tools.pref (-1 / +1 lines)
Lines 1-4 Link Here
1
Tools:
1
Tools:
2
    -
2
    -
3
        - pref: CsvProfileForExport
3
        - pref: ExportWithCsvProfile
4
        - CSV profile for export
4
        - CSV profile for export
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-3 / +3 lines)
Lines 201-208 function export_submit(format) { Link Here
201
    } else if (format == 'iso2709') {
201
    } else if (format == 'iso2709') {
202
        $("#dont_export_item").val(1);
202
        $("#dont_export_item").val(1);
203
    } else {
203
    } else {
204
        [% UNLESS ( csv_profile_for_export ) %]
204
        [% UNLESS ( export_with_csv_profile ) %]
205
            alert(_("You must defined a csv profile for export (in tools>CSV export profiles) and filled the CsvProfileForExport system preference"));
205
            alert(_("You must defined a csv profile for export (in tools>CSV export profiles) and filled the ExportWithCsvProfile system preference"));
206
            return false;
206
            return false;
207
        [% END %]
207
        [% END %]
208
    }
208
    }
Lines 920-926 No patron matched <span class="ex">[% message %]</span> Link Here
920
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
920
        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
921
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
921
        <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
922
        <br/><br/>
922
        <br/><br/>
923
        Don't export fields : <input type="text" id="dont_export_fields" name="dont_export_fields" value="[% dont_export_fields %]" title="Use for iso2709 exports" />
923
        Don't export fields : <input type="text" id="export_remove_fields" name="export_remove_fields" value="[% export_remove_fields %]" title="Use for iso2709 exports" />
924
        <span id="exportmenuc">Export</span>
924
        <span id="exportmenuc">Export</span>
925
        <input type="hidden" name="op" value="export" />
925
        <input type="hidden" name="op" value="export" />
926
        <input type="hidden" id="export_format" name="format" value="iso2709" />
926
        <input type="hidden" id="export_format" name="format" value="iso2709" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt (-4 / +4 lines)
Lines 107-114 $(document).ready(function() { Link Here
107
        <input id="strip_nonlocal_items" type="checkbox" name="strip_nonlocal_items" />
107
        <input id="strip_nonlocal_items" type="checkbox" name="strip_nonlocal_items" />
108
        </li>
108
        </li>
109
        <li>
109
        <li>
110
        <label for="dont_export_fields">Don't export fields</label>
110
        <label for="export_remove_fields">Don't export fields</label>
111
        <input id="dont_export_fields" type="text" name="dont_export_fields" value="[% dont_export_fields %]" />
111
        <input id="export_remove_fields" type="text" name="export_remove_fields" value="[% export_remove_fields %]" />
112
        separate by a blank. (e.g., 100a 200 606)
112
        separate by a blank. (e.g., 100a 200 606)
113
        </li></ol>
113
        </li></ol>
114
    </fieldset>
114
    </fieldset>
Lines 166-173 $(document).ready(function() { Link Here
166
    <legend>Options</legend>
166
    <legend>Options</legend>
167
        <ol>
167
        <ol>
168
        <li>
168
        <li>
169
            <label for="dont_export_fields">Don't export fields</label>
169
            <label for="export_remove_fields">Don't export fields</label>
170
            <input id="dont_export_fields" type="text" name="dont_export_fields" />
170
            <input id="export_remove_fields" type="text" name="export_remove_fields" />
171
            separate by a blank. (e.g., 100a 200 606)
171
            separate by a blank. (e.g., 100a 200 606)
172
        </li></ol>
172
        </li></ol>
173
    </fieldset>
173
    </fieldset>
(-)a/tools/export.pl (-6 / +5 lines)
Lines 156-162 if ( $op eq "export" ) { Link Here
156
        $record_type = $query->param("record_type") unless ($commandline);
156
        $record_type = $query->param("record_type") unless ($commandline);
157
        $output_format = $query->param("output_format") || 'marc'
157
        $output_format = $query->param("output_format") || 'marc'
158
          unless ($commandline);
158
          unless ($commandline);
159
        my $dont_export_fields = $query->param("dont_export_fields");
159
        my $export_remove_fields = $query->param("export_remove_fields");
160
        my @biblionumbers      = $query->param("biblionumbers");
160
        my @biblionumbers      = $query->param("biblionumbers");
161
        my @itemnumbers        = $query->param("itemnumbers");
161
        my @itemnumbers        = $query->param("itemnumbers");
162
        my @sql_params;
162
        my @sql_params;
Lines 355-362 if ( $op eq "export" ) { Link Here
355
                    next if not defined $record;
355
                    next if not defined $record;
356
                }
356
                }
357
357
358
                if ($dont_export_fields) {
358
                if ($export_remove_fields) {
359
                    my @fields = split " ", $dont_export_fields;
359
                    my @fields = split " ", $export_remove_fields;
360
                    foreach (@fields) {
360
                    foreach (@fields) {
361
                        /^(\d*)(\w)?$/;
361
                        /^(\d*)(\w)?$/;
362
                        my $field    = $1;
362
                        my $field    = $1;
Lines 394-400 if ( $op eq "export" ) { Link Here
394
        my @itemnumbers   = $query->param("itemnumbers");
394
        my @itemnumbers   = $query->param("itemnumbers");
395
        my $output =
395
        my $output =
396
          marc2csv( \@biblionumbers,
396
          marc2csv( \@biblionumbers,
397
            GetCsvProfileId( C4::Context->preference('CsvProfileForExport') ),
397
            GetCsvProfileId( C4::Context->preference('ExportWithCsvProfile') ),
398
            \@itemnumbers, );
398
            \@itemnumbers, );
399
        print $query->header(
399
        print $query->header(
400
            -type                        => 'application/octet-stream',
400
            -type                        => 'application/octet-stream',
Lines 468-474 else { Link Here
468
        itemtypeloop             => \@itemtypesloop,
468
        itemtypeloop             => \@itemtypesloop,
469
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
469
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
470
        authtypeloop             => \@authtypesloop,
470
        authtypeloop             => \@authtypesloop,
471
        dont_export_fields       => C4::Context->preference("DontExportFields"),
471
        export_remove_fields     => C4::Context->preference("ExportRemoveFields"),
472
    );
472
    );
473
473
474
    output_html_with_http_headers $query, $cookie, $template->output;
474
    output_html_with_http_headers $query, $cookie, $template->output;
475
- 

Return to bug 7986