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

(-)a/C4/Circulation.pm (+4 lines)
Lines 1934-1939 sub AddReturn { Link Here
1934
        }
1934
        }
1935
        else {
1935
        else {
1936
            foreach my $key ( keys %$rules ) {
1936
            foreach my $key ( keys %$rules ) {
1937
                # If item type in use has a disabled updatenotforloanstatusoncheckin flag then don't update notforloan
1938
                my $updatenotforloanstatusoncheckin = C4::Context->preference("item-level_itypes") ? Koha::ItemTypes->find($item->itype)->updatenotforloanstatusoncheckin : Koha::ItemTypes->find($item->biblioitem->itemtype)->updatenotforloanstatusoncheckin;
1939
                last if !$updatenotforloanstatusoncheckin;
1940
1937
                if ( $item->notforloan eq $key ) {
1941
                if ( $item->notforloan eq $key ) {
1938
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1942
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1939
                    $item->notforloan($rules->{$key})->store({ log_action => 0 });
1943
                    $item->notforloan($rules->{$key})->store({ log_action => 0 });
(-)a/admin/itemtypes.pl (-1 / +3 lines)
Lines 104-109 if ( $op eq 'add_form' ) { Link Here
104
    my $checkinmsg     = $input->param('checkinmsg');
104
    my $checkinmsg     = $input->param('checkinmsg');
105
    my $checkinmsgtype = $input->param('checkinmsgtype');
105
    my $checkinmsgtype = $input->param('checkinmsgtype');
106
    my $hideinopac     = $input->param('hideinopac') // 0;
106
    my $hideinopac     = $input->param('hideinopac') // 0;
107
    my $updatenotforloanstatusoncheckin = $input->param('updatenotforloanstatusoncheckin') // 0;
107
    my $searchcategory = $input->param('searchcategory');
108
    my $searchcategory = $input->param('searchcategory');
108
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
109
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
109
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
110
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
Lines 122-127 if ( $op eq 'add_form' ) { Link Here
122
        $itemtype->checkinmsgtype($checkinmsgtype);
123
        $itemtype->checkinmsgtype($checkinmsgtype);
123
        $itemtype->sip_media_type($sip_media_type);
124
        $itemtype->sip_media_type($sip_media_type);
124
        $itemtype->hideinopac($hideinopac);
125
        $itemtype->hideinopac($hideinopac);
126
        $itemtype->updatenotforloanstatusoncheckin($updatenotforloanstatusoncheckin);
125
        $itemtype->searchcategory($searchcategory);
127
        $itemtype->searchcategory($searchcategory);
126
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
128
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
127
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
129
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
Lines 153-158 if ( $op eq 'add_form' ) { Link Here
153
                checkinmsgtype      => $checkinmsgtype,
155
                checkinmsgtype      => $checkinmsgtype,
154
                sip_media_type      => $sip_media_type,
156
                sip_media_type      => $sip_media_type,
155
                hideinopac          => $hideinopac,
157
                hideinopac          => $hideinopac,
158
                updatenotforloanstatusoncheckin => $updatenotforloanstatusoncheckin,
156
                searchcategory      => $searchcategory,
159
                searchcategory      => $searchcategory,
157
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
160
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
158
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
161
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
159
- 

Return to bug 25560