From 9c7fbadac0f61c8596c7a4891e3534d5b6bae433 Mon Sep 17 00:00:00 2001 From: Blou Date: Mon, 27 Jul 2015 16:24:46 -0400 Subject: [PATCH] Bug 14605 - Corrects the individual fine's description MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When paying a fine, the description is built out of the borrower's type and title, instead of the actual fine's description. STEPS: 1) in the staff, go to a user with a fine to pay. a) if none, go to a user and Fines>>"Create manual invoice" with a distinctive description. 2) In Fines>>Pay fines, click the "Pay" button on the line of the fine. 3) This will take you a "Pay an individual fine" screen, where the description will look like "Staff Mrs", for the category and title of the borrower. Signed-off-by: Mirko Tietgen Signed-off-by: Marc Véron Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall (cherry picked from commit 63041c19c98b90c934ef89634dfdaf2d6abeb762) Signed-off-by: Frédéric Demians (cherry picked from commit 744b035932608a0ce3dd495765f9c249d1f527db) Signed-off-by: Julian Maurice --- koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt | 2 +- members/pay.pl | 1 + members/paycollect.pl | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index cb6902c148..bcf56ae6cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -130,7 +130,7 @@ function moneyFormat(textObj) { - [% description %] [% title %] + [% individual_description %] [% accounttype %] [% notify_id %] diff --git a/members/pay.pl b/members/pay.pl index f1025f4367..b6c3d915ab 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -172,6 +172,7 @@ sub redirect_to_paycollect { $redirect .= get_for_redirect( 'amount', "amount$line_no", 1 ); $redirect .= get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 ); + $redirect .= get_for_redirect( 'description', "description$line_no", 0 ); $redirect .= get_for_redirect( 'title', "title$line_no", 0 ); $redirect .= get_for_redirect( 'itemnumber', "itemnumber$line_no", 0 ); $redirect .= get_for_redirect( 'notify_id', "notify_id$line_no", 0 ); diff --git a/members/paycollect.pl b/members/paycollect.pl index 18e15751be..eed40bb5fc 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -60,6 +60,7 @@ my $select = $input->param('selected_accts'); my $payment_note = uri_unescape $input->param('payment_note'); my $accountno; my $accountlines_id; + if ( $individual || $writeoff ) { if ($individual) { $template->param( pay_individual => 1 ); @@ -85,7 +86,7 @@ if ( $individual || $writeoff ) { amountoutstanding => $amountoutstanding, title => $title, itemnumber => $itemnumber, - description => $description, + individual_description => $description, notify_id => $notify_id, notify_level => $notify_level, payment_note => $payment_note, -- 2.39.5