Attachment #1524 for bug #3701

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

Lines 178-184 sub CartToShelf { Link Here

(-)a/C4/Items.pm (-1 / +1 lines)
178	unless ( $itemnumber ) {	178	unless ( $itemnumber ) {
179	croak "FAILED CartToShelf() - no itemnumber supplied";	179	croak "FAILED CartToShelf() - no itemnumber supplied";
180	}	180	}
181		181
182	my $item = GetItem($itemnumber);	182	my $item = GetItem($itemnumber);
183	$item->{location} = $item->{permanent_location};	183	$item->{location} = $item->{permanent_location};
184	ModItem($item, undef, $itemnumber);	184	ModItem($item, undef, $itemnumber);




        }
    }

    if ( C4::Context->preference("ReturnToShelvingCart") ) {
        my $item = GetItem( $itemnumber );
        $item->{'location'} = 'CART';
        ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
    }

#
# save the return
#
    ( $returned, $messages, $issueinformation, $borrower ) =
      AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode);     # do the return

    if ( C4::Context->preference("ReturnToShelvingCart") && !$messages->{'WasTransfered'} ) {
        my $item = GetItem( $itemnumber );
        $item->{'location'} = 'CART';
        ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
    }

    # get biblio description
    my $biblio = GetBiblioFromItemNumber($itemnumber);
    # fix up item type for display
- 

Return to bug 3701

Lines 187-204 if ($barcode) { Link Here

(-)a/circ/returns.pl (-7 / +6 lines)
187	}	187	}
188	}	188	}
189		189
190	if ( C4::Context->preference("ReturnToShelvingCart") ) {
191	my $item = GetItem( $itemnumber );
192	$item->{'location'} = 'CART';
193	ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
194	}
195
196	#	190	#
197	# save the return	191	# save the return
198	#	192	#
199	( $returned, $messages, $issueinformation, $borrower ) =	193	( $returned, $messages, $issueinformation, $borrower ) =
200	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode); # do the return	194	AddReturn( $barcode, $userenv_branch, $exemptfine, $dropboxmode); # do the return
201		195
		196	if ( C4::Context->preference("ReturnToShelvingCart") && !$messages->{'WasTransfered'} ) {
		197	my $item = GetItem( $itemnumber );
		198	$item->{'location'} = 'CART';
		199	ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
		200	}
		201
202	# get biblio description	202	# get biblio description
203	my $biblio = GetBiblioFromItemNumber($itemnumber);	203	my $biblio = GetBiblioFromItemNumber($itemnumber);
204	# fix up item type for display	204	# fix up item type for display
205	-