Bugzilla – Attachment 47904 Details for
Bug 15564
Display "print slip" option when returning an item which is in a rotating collection
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty.
Bug-15564---Fix-tranfert-branch-Set-collection-bra.patch (text/plain), 3.04 KB, created by
Alex Arnaud
on 2016-02-11 15:04:09 UTC
(
hide
)
Description:
Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty.
Filename:
MIME Type:
Creator:
Alex Arnaud
Created:
2016-02-11 15:04:09 UTC
Size:
3.04 KB
patch
obsolete
>From ea6c6ccb446f68ff3bfe3e8ccc3ebbe8ff5dba29 Mon Sep 17 00:00:00 2001 >From: Alex Arnaud <alex.arnaud@biblibre.com> >Date: Thu, 11 Feb 2016 16:02:42 +0100 >Subject: [PATCH] Bug 15564 - Fix tranfert branch: Set collection branch with > return branch if it is empty. > >--- > circ/returns.pl | 8 +++++--- > koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 4 ++-- > 2 files changed, 7 insertions(+), 5 deletions(-) > >diff --git a/circ/returns.pl b/circ/returns.pl >index 7e97d59..3162236 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -249,6 +249,7 @@ if ($canceltransfer){ > } > > # actually return book and prepare item table..... >+my $returnbranch; > if ($barcode) { > $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace > $barcode = barcodedecode($barcode) if C4::Context->preference('itemBarcodeInputFilter'); >@@ -275,7 +276,7 @@ if ($barcode) { > > # make sure return branch respects home branch circulation rules, default to homebranch > my $hbr = GetBranchItemRule($biblio->{'homebranch'}, $itemtype->itemtype)->{'returnbranch'} || "homebranch"; >- my $returnbranch = $biblio->{$hbr} ; >+ $returnbranch = $biblio->{$hbr} ; > > $template->param( > title => $biblio->{'title'}, >@@ -629,11 +630,12 @@ $itemnumber = GetItemnumberFromBarcode( $barcode ); > if ( $itemnumber ) { > my ( $holdingBranch, $collectionBranch ) = GetCollectionItemBranches( $itemnumber ); > $holdingBranch //= ''; >- $collectionBranch //= ''; >+ $collectionBranch //= $returnbranch; > if ( ! ( $holdingBranch eq $collectionBranch ) ) { > $template->param( > collectionItemNeedsTransferred => 1, >- collectionBranch => GetBranchName($collectionBranch), >+ collectionBranchName => GetBranchName($collectionBranch), >+ collectionBranch => $collectionBranch, > itemnumber => $itemnumber, > ); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >index 1bbbd48..47a0d8d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -134,10 +134,10 @@ $(document).ready(function () { > > [% IF ( collectionItemNeedsTransferred ) %] > <div id="rotating-collection" class="dialog message"> >- <h3>Please transfer item to: [% collectionBranch %]</h3> >+ <h3>Please transfer item to: [% collectionBranchName %]</h3> > <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <p>This item is part of a rotating collection.</p> >- <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a></p> >+ <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% collectionBranch %]&op=slip'); return true;">Print slip</a></p> > </div> > [% END %] > >-- >1.7.10.4
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 15564
:
47067
|
47274
|
47526
|
47904
|
50120
|
50121
|
50908
|
50909