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

(-)a/C4/Circulation.pm (+4 lines)
Lines 1965-1970 sub AddReturn { Link Here
1965
        }
1965
        }
1966
        else {
1966
        else {
1967
            foreach my $key ( keys %$rules ) {
1967
            foreach my $key ( keys %$rules ) {
1968
                # If item type in use has a disabled updatenotforloanstatusoncheckin flag then don't update notforloan
1969
                my $updatenotforloanstatusoncheckin = C4::Context->preference("item-level_itypes") ? Koha::ItemTypes->find($item->itype)->updatenotforloanstatusoncheckin : Koha::ItemTypes->find($item->biblioitem->itemtype)->updatenotforloanstatusoncheckin;
1970
                last if !$updatenotforloanstatusoncheckin;
1971
1968
                if ( $item->notforloan eq $key ) {
1972
                if ( $item->notforloan eq $key ) {
1969
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1973
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1970
                    $item->notforloan($rules->{$key})->store({ log_action => 0, skip_record_index => 1 });
1974
                    $item->notforloan($rules->{$key})->store({ log_action => 0, skip_record_index => 1 });
(-)a/admin/itemtypes.pl (-1 / +3 lines)
Lines 109-114 if ( $op eq 'add_form' ) { Link Here
109
    my $checkinmsg     = $input->param('checkinmsg');
109
    my $checkinmsg     = $input->param('checkinmsg');
110
    my $checkinmsgtype = $input->param('checkinmsgtype');
110
    my $checkinmsgtype = $input->param('checkinmsgtype');
111
    my $hideinopac     = $input->param('hideinopac') // 0;
111
    my $hideinopac     = $input->param('hideinopac') // 0;
112
    my $updatenotforloanstatusoncheckin = $input->param('updatenotforloanstatusoncheckin') // 0;
112
    my $searchcategory = $input->param('searchcategory');
113
    my $searchcategory = $input->param('searchcategory');
113
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
114
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
114
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
115
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
Lines 128-133 if ( $op eq 'add_form' ) { Link Here
128
        $itemtype->checkinmsgtype($checkinmsgtype);
129
        $itemtype->checkinmsgtype($checkinmsgtype);
129
        $itemtype->sip_media_type($sip_media_type);
130
        $itemtype->sip_media_type($sip_media_type);
130
        $itemtype->hideinopac($hideinopac);
131
        $itemtype->hideinopac($hideinopac);
132
        $itemtype->updatenotforloanstatusoncheckin($updatenotforloanstatusoncheckin);
131
        $itemtype->searchcategory($searchcategory);
133
        $itemtype->searchcategory($searchcategory);
132
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
134
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
133
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
135
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
Lines 160-165 if ( $op eq 'add_form' ) { Link Here
160
                checkinmsgtype      => $checkinmsgtype,
162
                checkinmsgtype      => $checkinmsgtype,
161
                sip_media_type      => $sip_media_type,
163
                sip_media_type      => $sip_media_type,
162
                hideinopac          => $hideinopac,
164
                hideinopac          => $hideinopac,
165
                updatenotforloanstatusoncheckin => $updatenotforloanstatusoncheckin,
163
                searchcategory      => $searchcategory,
166
                searchcategory      => $searchcategory,
164
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
167
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
165
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
168
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
166
- 

Return to bug 25560