https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=26078
--- Comment #14 from Victor Grousset/tuxayo <[email protected]> --- Dependencies ok now. Can't backport to 19.05.x: can't solve a conflict. If there is an interest in having this backported, feel free to submit a patch for 19.05. Conflict: # if we have a transfer to do, we update the line of transfers with the datearrived my $is_in_rotating_collection = C4::RotatingCollections::isItemInAnyCollection( $item->itemnumber ); if ($datesent) { if ( $tobranch eq $branch ) { my $sth = C4::Context->dbh->prepare( "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL" ); $sth->execute( $item->itemnumber ); <<<<<<< HEAD # if we have a reservation with valid transfer, we can set it's status to 'W' C4::Reserves::ModReserveStatus($item->itemnumber, 'W'); ||||||| parent of 1b2eedbea9... Bug 26078: Prevent generating a new transfer from return policy when resolving a transfer ======= # If we are completing a transfer we should not generate a new transfer from return policy $returnbranch = $branch; >>>>>>> 1b2eedbea9... Bug 26078: Prevent generating a new transfer from return >>>>>>> policy when resolving a transfer } else { $messages->{'WrongTransfer'} = $tobranch; $messages->{'WrongTransferItem'} = $item->itemnumber; } $validTransfert = 1; } # fix up the accounts..... -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
