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

(-)a/C4/Items.pm (-2 / +7 lines)
Lines 190-197 sub CartToShelf { Link Here
190
    }
190
    }
191
191
192
    my $item = GetItem($itemnumber);
192
    my $item = GetItem($itemnumber);
193
    $item->{location} = $item->{permanent_location};
193
    if ( $item->{location} eq 'CART' ) {
194
    ModItem($item, undef, $itemnumber);
194
        $item->{location} = $item->{permanent_location};
195
        ModItem($item, undef, $itemnumber);
196
    }
195
}
197
}
196
198
197
=head2 AddItemFromMarc
199
=head2 AddItemFromMarc
Lines 542-547 sub ModItemTransfer { Link Here
542
544
543
    my $dbh = C4::Context->dbh;
545
    my $dbh = C4::Context->dbh;
544
546
547
    # Remove the 'shelving cart' location status if it is being used.
548
    CartToShelf( $itemnumber ) if ( C4::Context->preference("ReturnToShelvingCart") );
549
545
    #new entry in branchtransfers....
550
    #new entry in branchtransfers....
546
    my $sth = $dbh->prepare(
551
    my $sth = $dbh->prepare(
547
        "INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
552
        "INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
(-)a/circ/returns.pl (-7 / +6 lines)
Lines 212-223 if ($barcode) { Link Here
212
        }
212
        }
213
    }
213
    }
214
214
215
    if ( C4::Context->preference("ReturnToShelvingCart") ) {
216
        my $item = GetItem( $itemnumber );
217
        $item->{'location'} = 'CART';
218
        ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
219
    }
220
221
#
215
#
222
# save the return
216
# save the return
223
#
217
#
Lines 226-231 if ($barcode) { Link Here
226
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn');
220
    my $homeorholdingbranchreturn = C4::Context->preference('HomeOrHoldingBranchReturn');
227
    $homeorholdingbranchreturn ||= 'homebranch';
221
    $homeorholdingbranchreturn ||= 'homebranch';
228
222
223
    if ( C4::Context->preference("ReturnToShelvingCart") && !$messages->{'WasTransfered'} ) {
224
        my $item = GetItem( $itemnumber );
225
        $item->{'location'} = 'CART';
226
        ModItem( $item, $item->{'biblionumber'}, $item->{'itemnumber'} );
227
    }
228
229
    # get biblio description
229
    # get biblio description
230
    my $biblio = GetBiblioFromItemNumber($itemnumber);
230
    my $biblio = GetBiblioFromItemNumber($itemnumber);
231
    # fix up item type for display
231
    # fix up item type for display
232
- 

Return to bug 3701