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

(-)a/C4/Reserves.pm (-2 / +11 lines)
Lines 1874-1879 sub _koha_notify_reserve { Link Here
1874
1874
1875
    my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
1875
    my $admin_email_address = $branch_details->{'branchemail'} || C4::Context->preference('KohaAdminEmailAddress');
1876
1876
1877
    my $expiration = _reserve_last_pickup_date($reserve);
1878
1877
    my %letter_params = (
1879
    my %letter_params = (
1878
        module => 'reserves',
1880
        module => 'reserves',
1879
        branchcode => $reserve->{branchcode},
1881
        branchcode => $reserve->{branchcode},
Lines 1884-1890 sub _koha_notify_reserve { Link Here
1884
            'reserves'  => $reserve,
1886
            'reserves'  => $reserve,
1885
            'items', $reserve->{'itemnumber'},
1887
            'items', $reserve->{'itemnumber'},
1886
        },
1888
        },
1887
        substitute => { today => C4::Dates->new()->output() },
1889
        substitute => {
1890
                    today => C4::Dates->new()->output(),
1891
                    lastpickupdate => C4::Dates->new($expiration->ymd(), 'iso')->output()
1892
        },
1888
    );
1893
    );
1889
1894
1890
    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.
1895
    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.
Lines 2218-2223 sub ReserveSlip { Link Here
2218
    }) or return;
2223
    }) or return;
2219
    my $reserve = GetReserveInfo($reserve_id) or return;
2224
    my $reserve = GetReserveInfo($reserve_id) or return;
2220
2225
2226
    my $expiration = _reserve_last_pickup_date($reserve);
2227
2221
    return  C4::Letters::GetPreparedLetter (
2228
    return  C4::Letters::GetPreparedLetter (
2222
        module => 'circulation',
2229
        module => 'circulation',
2223
        letter_code => $transfer ? 'TRANSFERSLIP' : 'RESERVESLIP',
2230
        letter_code => $transfer ? 'TRANSFERSLIP' : 'RESERVESLIP',
Lines 2229-2234 sub ReserveSlip { Link Here
2229
            'biblio'      => $reserve->{biblionumber},
2236
            'biblio'      => $reserve->{biblionumber},
2230
            'items'       => $reserve->{itemnumber},
2237
            'items'       => $reserve->{itemnumber},
2231
        },
2238
        },
2239
        substitute => {
2240
            lastpickupdate => C4::Dates->new($expiration->ymd(), 'iso')->output()
2241
        },
2232
    );
2242
    );
2233
}
2243
}
2234
2244
2235
- 

Return to bug 12353