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

(-)a/C4/Reserves.pm (-11 / +4 lines)
Lines 165-180 sub AddReserve { Link Here
165
165
166
    my $dbh     = C4::Context->dbh;
166
    my $dbh     = C4::Context->dbh;
167
167
168
    $resdate = eval { output_pref( { dt => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' }); }
168
    $resdate = output_pref( { str => dt_from_string( $resdate ), dateonly => 1, dateformat => 'iso' })
169
               if ( $resdate );
169
        or output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' });
170
    $resdate = eval { output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' }); }
171
               unless ( $resdate );
172
170
173
    if ($expdate) {
171
    $expdate = output_pref({ str => $expdate, dateonly => 1, dateformat => 'iso' });
174
        $expdate = eval { output_pref( { dt => dt_from_string( $expdate), dateonly => 1, dateformat => 'iso' } ); };
175
    } else {
176
        undef $expdate; # make reserves.expirationdate default to null rather than '0000-00-00'
177
    }
178
172
179
    if ( C4::Context->preference('AllowHoldDateInFuture') ) {
173
    if ( C4::Context->preference('AllowHoldDateInFuture') ) {
180
174
Lines 1978-1984 sub _koha_notify_reserve { Link Here
1978
            'reserves'  => $reserve,
1972
            'reserves'  => $reserve,
1979
            'items', $reserve->{'itemnumber'},
1973
            'items', $reserve->{'itemnumber'},
1980
        },
1974
        },
1981
        substitute => { today => eval { output_pref( { dt => dt_from_string, dateonly => 1 } ); } },
1975
        substitute => { today => output_pref( { dt => dt_from_string, dateonly => 1 } ) },
1982
    );
1976
    );
1983
1977
1984
    my $notification_sent = 0; #Keeping track if a Hold_filled message is sent. If no message can be sent, then default to a print message.
1978
    my $notification_sent = 0; #Keeping track if a Hold_filled message is sent. If no message can be sent, then default to a print message.
1985
- 

Return to bug 14985