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

(-)a/Koha/Calendar.pm (+2 lines)
Lines 167-172 sub addDays { Link Here
167
    my ( $self, $startdate, $days_duration ) = @_;
167
    my ( $self, $startdate, $days_duration ) = @_;
168
    my $base_date = $startdate->clone();
168
    my $base_date = $startdate->clone();
169
169
170
    $self->{days_mode} ||= q{};
171
170
    if ( $self->{days_mode} eq 'Calendar' ) {
172
    if ( $self->{days_mode} eq 'Calendar' ) {
171
        # use the calendar to skip all days the library is closed
173
        # use the calendar to skip all days the library is closed
172
        # when adding
174
        # when adding
(-)a/Koha/DateUtils.pm (-1 / +1 lines)
Lines 128-134 sub output_pref { Link Here
128
    my $pref =
128
    my $pref =
129
      defined $force_pref ? $force_pref : C4::Context->preference('dateformat');
129
      defined $force_pref ? $force_pref : C4::Context->preference('dateformat');
130
130
131
    my $time_format = $force_time || C4::Context->preference('TimeFormat');
131
    my $time_format = $force_time || C4::Context->preference('TimeFormat') || q{};
132
    my $time = ( $time_format eq '12hr' ) ? '%I:%M %p' : '%H:%M';
132
    my $time = ( $time_format eq '12hr' ) ? '%I:%M %p' : '%H:%M';
133
    my $date;
133
    my $date;
134
    if ( $pref =~ m/^iso/ ) {
134
    if ( $pref =~ m/^iso/ ) {
(-)a/t/db_dependent/Circulation.t (-1 / +1 lines)
Lines 291-296 C4::Context->dbh->do("DELETE FROM accountlines"); Link Here
291
    );
291
    );
292
292
293
    # Testing of feature to allow the renewal of reserved items if other items on the record can fill all needed holds
293
    # Testing of feature to allow the renewal of reserved items if other items on the record can fill all needed holds
294
    C4::Context->set_preference('AllowOnShelfHolds', 1 );
294
    C4::Context->set_preference('AllowRenewalIfOtherItemsAvailable', 1 );
295
    C4::Context->set_preference('AllowRenewalIfOtherItemsAvailable', 1 );
295
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
296
    ( $renewokay, $error ) = CanBookBeRenewed($renewing_borrowernumber, $itemnumber);
296
    is( $renewokay, 1, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
297
    is( $renewokay, 1, 'Bug 11634 - Allow renewal of item with unfilled holds if other available items can fill those holds');
297
- 

Return to bug 11634