Bugzilla – Attachment 86816 Details for
Bug 14576
Allow automatic update of location on checkin
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14576: Rebase fixes Fix test Rebase code
Bug-14576-Rebase-fixes-Fix-test-Rebase-code.patch (text/plain), 4.04 KB, created by
Nick Clemens (kidclamp)
on 2019-03-20 15:47:52 UTC
(
hide
)
Description:
Bug 14576: Rebase fixes Fix test Rebase code
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2019-03-20 15:47:52 UTC
Size:
4.04 KB
patch
obsolete
>From 840f39bbfca2d2f22a3053cb756c872693c3ff7f Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Wed, 20 Mar 2019 15:46:26 +0000 >Subject: [PATCH] Bug 14576: Rebase fixes Fix test Rebase code > >--- > C4/Circulation.pm | 13 ++++++------- > t/db_dependent/Circulation/issue.t | 2 +- > 2 files changed, 7 insertions(+), 8 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 0f456e6a51..626c5f7e8f 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1424,7 +1424,6 @@ sub AddIssue { > } > )->store; > } >- > if ( $item_object->location eq 'CART' && $item_object->permanent_location ne 'CART' ) { > ## Item was moved to cart via UpdateItemLocationOnCheckin, anything issued should be taken off the cart. > CartToShelf( $item_object->itemnumber ); >@@ -1886,19 +1885,19 @@ sub AddReturn { > map { $update_loc_rules->{$_} = $update_loc_rules->{$_}[0] } keys %$update_loc_rules; #We can only move to one location so we flatten the arrays > if ($update_loc_rules) { > if (defined $update_loc_rules->{_ALL_}) { >- if ($update_loc_rules->{_ALL_} eq '_PERM_') { $update_loc_rules->{_ALL_} = $item->{permanent_location}; } >+ if ($update_loc_rules->{_ALL_} eq '_PERM_') { $update_loc_rules->{_ALL_} = $item->permanent_location; } > if ($update_loc_rules->{_ALL_} eq '_BLANK_') { $update_loc_rules->{_ALL_} = ''; } >- if ( $item->{location} ne $update_loc_rules->{_ALL_}) { >- $messages->{'ItemLocationUpdated'} = { from => $item->{location}, to => $update_loc_rules->{_ALL_} }; >+ if ( $item->location ne $update_loc_rules->{_ALL_}) { >+ $messages->{'ItemLocationUpdated'} = { from => $item->location, to => $update_loc_rules->{_ALL_} }; > ModItem( { location => $update_loc_rules->{_ALL_} }, undef, $itemnumber ); > } > } > else { > foreach my $key ( keys %$update_loc_rules ) { >- if ( $update_loc_rules->{$key} eq '_PERM_' ) { $update_loc_rules->{$key} = $item->{permanent_location}; } >+ if ( $update_loc_rules->{$key} eq '_PERM_' ) { $update_loc_rules->{$key} = $item->permanent_location; } > if ( $update_loc_rules->{$key} eq '_BLANK_') { $update_loc_rules->{$key} = '' ;} >- if ( ($item->{location} eq $key && $item->{location} ne $update_loc_rules->{$key}) || ($key eq '_BLANK_' && $item->{location} eq '' && $update_loc_rules->{$key} ne '') ) { >- $messages->{'ItemLocationUpdated'} = { from => $item->{location}, to => $update_loc_rules->{$key} }; >+ if ( ($item->location eq $key && $item->location ne $update_loc_rules->{$key}) || ($key eq '_BLANK_' && $item->location eq '' && $update_loc_rules->{$key} ne '') ) { >+ $messages->{'ItemLocationUpdated'} = { from => $item->location, to => $update_loc_rules->{$key} }; > ModItem( { location => $update_loc_rules->{$key} }, undef, $itemnumber ); > last; > } >diff --git a/t/db_dependent/Circulation/issue.t b/t/db_dependent/Circulation/issue.t >index 31dd457252..e945876378 100644 >--- a/t/db_dependent/Circulation/issue.t >+++ b/t/db_dependent/Circulation/issue.t >@@ -418,7 +418,7 @@ $item2 = Koha::Items->find( $itemnumber2 ); > ok( $item2->location eq 'PROC' , q{UpdateItemLocationOnCheckin updates location value from '' to 'PROC' with setting "_BLANK_: PROC"} ); > ok( $item2->permanent_location eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location value from '' to 'PROC' with setting "_BLANK_: PROC"} ); > AddReturn( 'barcode_4', $branchcode_1 ); >-$item2 = Koha::Items( $itemnumber2 ); >+$item2 = Koha::Items->find( $itemnumber2 ); > ok( $item2->location eq '' , q{UpdateItemLocationOnCheckin updates location value from 'PROC' to '' with setting "PROC: _PERM_" } ); > ok( $item2->permanent_location eq '' , q{UpdateItemLocationOnCheckin does not update permanent_location from '' with setting "PROC: _PERM_" } ); > >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14576
:
46454
|
46455
|
46456
|
48258
|
48259
|
50662
|
50663
|
52195
|
52196
|
52197
|
52204
|
52205
|
52206
|
52222
|
52223
|
52224
|
52365
|
53112
|
53113
|
53114
|
53115
|
54281
|
54644
|
54645
|
54646
|
54647
|
54648
|
54654
|
55587
|
60658
|
60659
|
60660
|
60661
|
60662
|
60663
|
60747
|
60748
|
60751
|
61940
|
61941
|
61942
|
61944
|
61945
|
61946
|
61947
|
61948
|
61949
|
61950
|
64656
|
64657
|
64658
|
67610
|
67611
|
68297
|
70795
|
70796
|
70797
|
72032
|
72033
|
72034
|
75661
|
75662
|
75663
|
79245
|
79246
|
79995
|
79996
|
83113
|
83114
|
83115
|
83696
|
83697
|
83698
|
85406
|
85850
|
85851
|
85852
|
85853
|
86812
|
86813
|
86814
|
86815
|
86816
|
87040
|
87061
|
87144
|
87145
|
87146
|
87147
|
87148
|
87149
|
87150
|
87151
|
87925
|
88451
|
88452
|
88453
|
88454
|
88455
|
88456
|
88457
|
88458
|
88459
|
88646
|
88647
|
88648
|
88649
|
88650
|
88651
|
88652
|
88653
|
88654