Bugzilla – Attachment 40106 Details for
Bug 13600
XSLT: 8xx not showing if there is no 4xx
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Bug 14280: Add branches fields to discharges letters
Bug-14280-Add-branches-fields-to-discharges-letter.patch (text/plain), 2.99 KB, created by
Nick Clemens (kidclamp)
on 2015-06-12 20:16:43 UTC
(
hide
)
Description:
Bug 14280: Add branches fields to discharges letters
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2015-06-12 20:16:43 UTC
Size:
2.99 KB
patch
obsolete
>From 56784c208ac660b0b0e57a43d6118c614a57985e Mon Sep 17 00:00:00 2001 >From: Matthias Meusburger <matthias.meusburger@biblibre.com> >Date: Wed, 27 May 2015 11:52:10 +0200 >Subject: [PATCH] Bug 14280: Add branches fields to discharges letters >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Currently, when generating a discharge letter, branches fields are not translated in the letter (<<branches.branchname>>, <<branches.branchaddress1>>, etc.) >This patch fixes that. > >How I tested: >- Set syspref 'useDischarge' to 'allow' >- Go to Home > Tools > Notices & Slips >- Edit DISCHARGE, add to 'Email message': ><p><<branches.branchname>><br /> ><<branches.branchaddress1>><br /> ><<branches.branchaddress2>><br /> ><<branches.branchaddress3>><br /> ><<branches.zip>> <<branches.city>><br /> ></p> >- Go to detail page of a patron > discharge >- Click 'Generate discharge' >- Verify that the PDF contains the information above. > >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar> > >Signed-off-by: Nick Clemens <nick@quecheelibrary.org> > >http://bugs.koha-community.org/show_bug.cgi?id=13600 >--- > Koha/Borrower/Discharge.pm | 2 +- > members/discharge.pl | 2 +- > opac/opac-discharge.pl | 6 +++++- > 3 files changed, 7 insertions(+), 3 deletions(-) > >diff --git a/Koha/Borrower/Discharge.pm b/Koha/Borrower/Discharge.pm >index f39475b..ba0216d 100644 >--- a/Koha/Borrower/Discharge.pm >+++ b/Koha/Borrower/Discharge.pm >@@ -95,7 +95,7 @@ sub generate_as_pdf { > my $letter = C4::Letters::GetPreparedLetter( > module => 'members', > letter_code => 'DISCHARGE', >- tables => { borrowers => $params->{borrowernumber}, }, >+ tables => { borrowers => $params->{borrowernumber}, branches => $params->{'branchcode'}, }, > ); > > my $today = output_pref( dt_from_string() ); >diff --git a/members/discharge.pl b/members/discharge.pl >index 2144af9..7c73af9 100755 >--- a/members/discharge.pl >+++ b/members/discharge.pl >@@ -78,7 +78,7 @@ if ( $input->param('borrowernumber') ) { > } > eval { > my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf( >- { borrowernumber => $borrowernumber, } ); >+ { borrowernumber => $borrowernumber, branchcode => $data->{'branchcode'} } ); > > binmode(STDOUT); > print $input->header( >diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl >index 800222c..5955a3e 100755 >--- a/opac/opac-discharge.pl >+++ b/opac/opac-discharge.pl >@@ -57,8 +57,12 @@ if ( $op eq 'request' ) { > } > elsif ( $op eq 'get' ) { > eval { >+ >+ # Getting member data >+ my $data = GetMember( borrowernumber => $loggedinuser ); > my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf({ >- borrowernumber => $loggedinuser >+ borrowernumber => $loggedinuser, >+ branchcode => $data->{'branchcode'}, > }); > > binmode(STDOUT); >-- >1.9.1
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 Raw
Actions:
View
Attachments on
bug 13600
:
40097
|
40106
|
40107
|
40207
|
40636
|
40637
|
140705
|
140706
|
140736
|
142530
|
142588
|
142589
|
143069
|
143566
|
143567
|
143568