Attachment 63526 Details for Bug 18606 – Bug 18606: Fix issues to pass tests

[patch] Bug 18606: Fix issues to pass tests

Bug-18606-Fix-issues-to-pass-tests.patch (text/plain), 2.71 KB, created by Josef Moravec on 2017-05-18 09:22:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2017-05-18 09:22:30 UTC

Size: 2.71 KB

patch

obsolete

>From 577f48286559d3e9f92b2beeb0abd4ebe5535556 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Wed, 17 May 2017 16:26:11 +0000
>Subject: [PATCH] Bug 18606: Fix issues to pass tests
>
>---
> Koha/RotatingCollection.pm | 17 ++++++++++++-----
> circ/returns.pl            |  4 +++-
> 2 files changed, 15 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/RotatingCollection.pm b/Koha/RotatingCollection.pm
>index 42a97cd..165e080 100644
>--- a/Koha/RotatingCollection.pm
>+++ b/Koha/RotatingCollection.pm
>@@ -23,6 +23,7 @@ use Carp;
> 
> use Koha::Database;
> use Koha::Exceptions;
>+use Koha::Holds;
> use Koha::Items;
> use Koha::RotatingCollection::Trackings;
> 
>@@ -62,7 +63,8 @@ $collection->add_item( $itemnumber );
> 
> throws
>     Koha::Exceptions::MissingParameter
>-    Koha::Exceptions::WrongParameter
>+    Koha::Exceptions::DuplicateObject
>+    Koha::Exceptions::ObjectNotFound
> 
> =cut
> 
>@@ -74,6 +76,8 @@ sub add_item {
>     Koha::Exceptions::DuplicateObject->throw
>         if Koha::RotatingCollection::Trackings->search( { itemnumber => $itemnumber } )->count;
> 
>+    Koha::Exceptions::ObjectNotFound->throw if not Koha::Items->find( $itemnumber );
>+
>     my $col_tracking = Koha::RotatingCollection::Tracking->new(
>         {
>             colId => $self->colId,
>@@ -126,10 +130,13 @@ sub transfer {
> 
>     $self->colBranchcode( $branchcode )->store;
> 
>-    for ( my $item = $self->items ) {
>-        my ( $status ) = C4::Reserves::CheckReserves( $item->itemnumber );
>-        my @transfers = C4::Circulation::GetTransfers( $item->itemnumber );
>-        C4::Circulation::transferbook( $branchcode, $item->barcode, my $ignore_reserves = 1 ) unless ( $status eq 'Waiting' || @transfers );
>+    my $items = $self->items;
>+    while ( my $item = $items->next ) {
>+        my $holds = Koha::Holds->search( {
>+            itemnumber => $item->itemnumber,
>+            found      => 'W',
>+        } );
>+        C4::Circulation::transferbook( $branchcode, $item->barcode, my $ignore_reserves = 1 ) unless ( $holds->count || $item->get_transfer );
>     }
> }
> 
>diff --git a/circ/returns.pl b/circ/returns.pl
>index fd3b529..a6843dd 100755
>--- a/circ/returns.pl
>+++ b/circ/returns.pl
>@@ -645,7 +645,9 @@ $itemnumber = GetItemnumberFromBarcode( $barcode );
> if ( $itemnumber ) {
>     my $item = Koha::Items->find( $itemnumber );
>     my $holdingBranch = $item->holdingbranch;
>-    my $collectionBranch = $item->rotating_collection->colBranchcode;
>+    my $collection = $item->rotating_collection;
>+    my $collectionBranch;
>+    $collectionBranch = $collection->colBranchcode if $collection;
>     if ( $holdingBranch and $collectionBranch and ( $holdingBranch ne $collectionBranch ) ) {
>         $template->param(
>           collectionItemNeedsTransferred => 1,
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18606: 63508 | 63509 | 63510 | 63511 | 63512 | 63513 | 63514 | 63515 | 63516 | 63517 | 63518 | 63519 | 63520 | 63521 | 63522 | 63523 | 63524 | 63525 | 63526 | 63527 | 63528 | 66227 | 66228 | 66229 | 66230 | 66231 | 66232 | 66233 | 66234 | 66235 | 66236 | 66237 | 66238 | 66239 | 66240 | 66241 | 66286 | 66287 | 66288 | 66289 | 66290 | 66291 | 66292 | 66293 | 66294 | 66295 | 66296 | 66297 | 66298 | 66299 | 66300 | 67734 | 67735 | 67736 | 67737 | 67738 | 67739 | 67740 | 67741 | 67742 | 67743 | 67744 | 67745 | 67746 | 67747 | 67748 | 67749 | 68428 | 68429 | 68430 | 68431 | 68432 | 68433 | 68434 | 68435 | 68436 | 68437 | 68438 | 68439 | 68440 | 68441 | 68442 | 68443 | 69709 | 69710 | 69711 | 69712 | 69713 | 69714 | 69715 | 69716 | 69717 | 69718 | 69719 | 69720 | 69721 | 69722 | 69723 | 69759 | 72416 | 72417 | 72418 | 72419 | 72420 | 72421 | 72422 | 72423 | 72424 | 72425 | 72426 | 72427 | 72428 | 72429 | 72430 | 72431 | 72572 | 72573 | 72574 | 72575 | 72576 | 72577 | 72578 | 72579 | 72580 | 72581 | 72582 | 72583 | 72584 | 72585 | 72586 | 72587 | 72816 | 79141 | 79142 | 79143 | 79144 | 79145 | 79146 | 79147 | 79148 | 79149 | 79150 | 79151 | 79152 | 79153 | 79154 | 79155 | 79156 | 79157 | 79158 | 79161