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

(-)a/C4/Circulation.pm (+4 lines)
Lines 1943-1948 sub AddReturn { Link Here
1943
        }
1943
        }
1944
        else {
1944
        else {
1945
            foreach my $key ( keys %$rules ) {
1945
            foreach my $key ( keys %$rules ) {
1946
                # If item type in use has a disabled updatenotforloanstatusoncheckin flag then don't update notforloan
1947
                my $updatenotforloanstatusoncheckin = C4::Context->preference("item-level_itypes") ? Koha::ItemTypes->find($item->itype)->updatenotforloanstatusoncheckin : Koha::ItemTypes->find($item->biblioitem->itemtype)->updatenotforloanstatusoncheckin;
1948
                last if !$updatenotforloanstatusoncheckin;
1949
1946
                if ( $item->notforloan eq $key ) {
1950
                if ( $item->notforloan eq $key ) {
1947
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1951
                    $messages->{'NotForLoanStatusUpdated'} = { from => $item->notforloan, to => $rules->{$key} };
1948
                    $item->notforloan($rules->{$key})->store({ log_action => 0 });
1952
                    $item->notforloan($rules->{$key})->store({ log_action => 0 });
(-)a/admin/itemtypes.pl (-1 / +3 lines)
Lines 110-115 if ( $op eq 'add_form' ) { Link Here
110
    my $checkinmsg     = $input->param('checkinmsg');
110
    my $checkinmsg     = $input->param('checkinmsg');
111
    my $checkinmsgtype = $input->param('checkinmsgtype');
111
    my $checkinmsgtype = $input->param('checkinmsgtype');
112
    my $hideinopac     = $input->param('hideinopac') // 0;
112
    my $hideinopac     = $input->param('hideinopac') // 0;
113
    my $updatenotforloanstatusoncheckin = $input->param('updatenotforloanstatusoncheckin') // 0;
113
    my $searchcategory = $input->param('searchcategory');
114
    my $searchcategory = $input->param('searchcategory');
114
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
115
    my $rentalcharge_daily_calendar  = $input->param('rentalcharge_daily_calendar') // 0;
115
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
116
    my $rentalcharge_hourly_calendar = $input->param('rentalcharge_hourly_calendar') // 0;
Lines 129-134 if ( $op eq 'add_form' ) { Link Here
129
        $itemtype->checkinmsgtype($checkinmsgtype);
130
        $itemtype->checkinmsgtype($checkinmsgtype);
130
        $itemtype->sip_media_type($sip_media_type);
131
        $itemtype->sip_media_type($sip_media_type);
131
        $itemtype->hideinopac($hideinopac);
132
        $itemtype->hideinopac($hideinopac);
133
        $itemtype->updatenotforloanstatusoncheckin($updatenotforloanstatusoncheckin);
132
        $itemtype->searchcategory($searchcategory);
134
        $itemtype->searchcategory($searchcategory);
133
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
135
        $itemtype->rentalcharge_daily_calendar($rentalcharge_daily_calendar);
134
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
136
        $itemtype->rentalcharge_hourly_calendar($rentalcharge_hourly_calendar);
Lines 161-166 if ( $op eq 'add_form' ) { Link Here
161
                checkinmsgtype      => $checkinmsgtype,
163
                checkinmsgtype      => $checkinmsgtype,
162
                sip_media_type      => $sip_media_type,
164
                sip_media_type      => $sip_media_type,
163
                hideinopac          => $hideinopac,
165
                hideinopac          => $hideinopac,
166
                updatenotforloanstatusoncheckin => $updatenotforloanstatusoncheckin,
164
                searchcategory      => $searchcategory,
167
                searchcategory      => $searchcategory,
165
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
168
                rentalcharge_daily_calendar  => $rentalcharge_daily_calendar,
166
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
169
                rentalcharge_hourly_calendar => $rentalcharge_hourly_calendar,
167
- 

Return to bug 25560