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

(-)a/C4/Circulation.pm (+3 lines)
Lines 2049-2054 sub AddReturn { Link Here
2049
                "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL"
2049
                "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL"
2050
            );
2050
            );
2051
            $sth->execute( $item->itemnumber );
2051
            $sth->execute( $item->itemnumber );
2052
2053
            # If we are completing a transfer we should not generate a new transfer from return policy
2054
            $returnbranch = $branch;
2052
        } else {
2055
        } else {
2053
            $messages->{'WrongTransfer'}     = $tobranch;
2056
            $messages->{'WrongTransfer'}     = $tobranch;
2054
            $messages->{'WrongTransferItem'} = $item->itemnumber;
2057
            $messages->{'WrongTransferItem'} = $item->itemnumber;
(-)a/t/db_dependent/Circulation/Branch.t (-2 / +7 lines)
Lines 25-31 use Koha::CirculationRules; Link Here
25
25
26
use Koha::Patrons;
26
use Koha::Patrons;
27
27
28
use Test::More tests => 14;
28
use Test::More tests => 15;
29
use t::lib::Mocks;
29
use t::lib::Mocks;
30
use t::lib::TestBuilder;
30
use t::lib::TestBuilder;
31
31
Lines 303-308 $dbh->do( $query, {}, $borrower_id1, $item_id2, $samplebranch2->{branchcode} ); Link Here
303
    $samplebranch2->{branchcode});
303
    $samplebranch2->{branchcode});
304
is( $messages->{NeedsTransfer}, $samplebranch1->{branchcode}, "AddReturn respects branch return policy - item2->homebranch policy = 'holdingbranch'" );
304
is( $messages->{NeedsTransfer}, $samplebranch1->{branchcode}, "AddReturn respects branch return policy - item2->homebranch policy = 'holdingbranch'" );
305
305
306
# Generate the transfer from above
307
ModItemTransfer($item_id2, $samplebranch2->{branchcode}, $samplebranch1->{branchcode}, "ReturnToHolding");
308
# Fulfill it
309
($doreturn, $messages, $iteminformation, $borrower) = AddReturn('barcode_2',$samplebranch1->{branchcode});
310
is( $messages->{NeedsTransfer}, undef, "AddReturn does not generate a new transfer for return policy when resolving an existing transfer" );
311
306
# item3 should not trigger transfer - floating collection
312
# item3 should not trigger transfer - floating collection
307
$query =
313
$query =
308
"INSERT INTO issues (borrowernumber,itemnumber,branchcode) VALUES( ?,?,? )";
314
"INSERT INTO issues (borrowernumber,itemnumber,branchcode) VALUES( ?,?,? )";
309
- 

Return to bug 26078