MT2116, Follow-up: CSV Export, fix backporting bugs

diff --git a/C4/Koha.pm b/C4/Koha.pm
index dc10a6e..544f3a2 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1110,7 +1110,7 @@ sub GetKohaAuthorisedValuesFromField {
   my $dbh = C4::Context->dbh;
   my $avcode = GetAuthValCodeFromField($field, $subfield, $fwcode);
   if ($avcode) {  
-       my $sth = $dbh->prepare("select authorised_value, lib, lib_opac from authorised_values where category=? ");
+       my $sth = $dbh->prepare("select authorised_value, lib  from authorised_values where category=? ");
        $sth->execute($avcode);
        while ( my ($val, $lib, $lib_opac) = $sth->fetchrow_array ) { 
                $values{$val} = ($opac && $lib_opac) ? $lib_opac : $lib;

diff --git a/C4/Record.pm b/C4/Record.pm
index 65f3f7a..bce362b 100644 (file)
--- a/C4/Record.pm
+++ b/C4/Record.pm
@@ -360,7 +360,6 @@ sub marc2csv {
         ($preprocess,$postprocess, $fieldprocessing) = YAML::LoadFile($configfile);
     }
 
-    warn $fieldprocessing;
     # Preprocessing
     eval $preprocess if ($preprocess);
 

diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
index 5fea3a8..785b5e3 100644 (file)
--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
@@ -16,6 +16,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
    (13, 'delete_anonymize_patrons', 'Delete old borrowers and anonymize circulation history (deletes borrower reading history)'),
    (13, 'batch_upload_patron_images', 'Upload patron images in batch or one at a time'),
    (13, 'schedule_tasks', 'Schedule tasks to run'),
+   (13, 'manage_csv_profiles', 'Manage CSV export profiles'),
    (15, 'check_expiration', 'Check the expiration of a serial'),
    (15, 'claim_serials', 'Claim missing serials'),
    (15, 'create_subscription', 'Create a new subscription'),