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

(-)a/installer/data/mysql/updatedatabase.pl (-3 / +3 lines)
Lines 36-44 use Getopt::Long; Link Here
36
# Koha modules
36
# Koha modules
37
use C4::Context;
37
use C4::Context;
38
use C4::Installer;
38
use C4::Installer;
39
use C4::Dates;
40
use Koha::Database;
39
use Koha::Database;
41
use Koha;
40
use Koha;
41
use Koha::DateUtils;
42
42
43
use MARC::Record;
43
use MARC::Record;
44
use MARC::File::XML ( BinaryEncoding => 'utf8' );
44
use MARC::File::XML ( BinaryEncoding => 'utf8' );
Lines 4170-4179 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4170
    $dbh->do("ALTER TABLE `issuingrules` ADD hardduedatecompare tinyint NOT NULL default 0 AFTER hardduedate");
4170
    $dbh->do("ALTER TABLE `issuingrules` ADD hardduedatecompare tinyint NOT NULL default 0 AFTER hardduedate");
4171
    my $duedate;
4171
    my $duedate;
4172
    if (C4::Context->preference("globalDueDate")) {
4172
    if (C4::Context->preference("globalDueDate")) {
4173
      $duedate = C4::Dates::format_date_in_iso(C4::Context->preference("globalDueDate"));
4173
      $duedate = eval { output_pref( { dt => dt_from_string( C4::Context->preference("globalDueDate") ), dateonly => 1, dateformat => 'iso' } ); };
4174
      $dbh->do("UPDATE `issuingrules` SET hardduedate = '$duedate', hardduedatecompare = 0");
4174
      $dbh->do("UPDATE `issuingrules` SET hardduedate = '$duedate', hardduedatecompare = 0");
4175
    } elsif (C4::Context->preference("ceilingDueDate")) {
4175
    } elsif (C4::Context->preference("ceilingDueDate")) {
4176
      $duedate = C4::Dates::format_date_in_iso(C4::Context->preference("ceilingDueDate"));
4176
      $duedate = eval { output_pref( { dt => dt_from_string( C4::Context->preference("ceilingDueDate") ), dateonly => 1, dateformat => 'iso' } ); };
4177
      $dbh->do("UPDATE `issuingrules` SET hardduedate = '$duedate', hardduedatecompare = -1");
4177
      $dbh->do("UPDATE `issuingrules` SET hardduedate = '$duedate', hardduedatecompare = -1");
4178
    }
4178
    }
4179
    $dbh->do("DELETE FROM `systempreferences` WHERE variable = 'globalDueDate' OR variable = 'ceilingDueDate'");
4179
    $dbh->do("DELETE FROM `systempreferences` WHERE variable = 'globalDueDate' OR variable = 'ceilingDueDate'");
(-)a/misc/maintenance/fix_accountlines_date.pl (-8 / +7 lines)
Lines 27-35 BEGIN { Link Here
27
}
27
}
28
28
29
use C4::Context;
29
use C4::Context;
30
use C4::Dates;
31
use Getopt::Long;
30
use Getopt::Long;
32
use Pod::Usage;
31
use Pod::Usage;
32
use Koha::DateUtils;
33
33
34
=head1 NAME
34
=head1 NAME
35
35
Lines 146-161 while (my $accountline = $sth->fetchrow_hashref) { Link Here
146
146
147
    if ($mode eq 'us') {
147
    if ($mode eq 'us') {
148
        if ($description =~ /$US_DATE/) { # mm/dd/yyyy
148
        if ($description =~ /$US_DATE/) { # mm/dd/yyyy
149
            my $date = C4::Dates->new($1, 'us');
149
            my $date = eval { output_pref( { dt => dt_from_string( $1 ), dateonly => 1, dateformat => 'us' } ); };
150
            print "Converting $1 (us) to " . $date->output() . "\n" if $DEBUG;
150
            print "Converting $1 (us) to " . $date . "\n" if $DEBUG;i
151
            $description =~ s/$US_DATE/$date->output()/;
151
            $description =~ s/$US_DATE/$date/;
152
            $updated = 1;
152
            $updated = 1;
153
        }
153
        }
154
    } elsif ($mode eq 'metric') {
154
    } elsif ($mode eq 'metric') {
155
        if ($description =~ /$METRIC_DATE/) { # dd/mm/yyyy
155
        if ($description =~ /$METRIC_DATE/) { # dd/mm/yyyy
156
            my $date = C4::Dates->new($1, 'metric');
156
            my $date = eval { output_pref( { dt => dt_from_string( $1 ), dateonly => 1, dateformat => 'metric' } ); };
157
            print "Converting $1 (metric) to " . $date->output() . "\n" if $DEBUG;
157
            print "Converting $1 (metric) to " . $date . "\n" if $DEBUG;
158
            $description =~ s/$METRIC_DATE/$date->output()/;
158
            $description =~ s/$METRIC_DATE/$date/;
159
            $updated = 2;
159
            $updated = 2;
160
        }
160
        }
161
    }
161
    }
162
- 

Return to bug 14998