summaryrefslogtreecommitdiff
authorBlou <philippe.blouin@inlibro.com>2015-07-27 20:24:46 (GMT)
committer Kyle M Hall <kyle@bywatersolutions.com>2016-06-10 17:34:08 (GMT)
commit63041c19c98b90c934ef89634dfdaf2d6abeb762 (patch) (side-by-side diff)
treecfed0cedc8609a05510f1ef24665b6ec662d6198
parent4f3067184d7dd3666d404a2165d72755cb0b227d (diff)
Bug 14605 - Corrects the individual fine's description
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 <mirko@abunchofthings.net> Signed-off-by: Marc VĂ©ron <veron@veron.ch> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt2
-rwxr-xr-xmembers/pay.pl1
-rwxr-xr-xmembers/paycollect.pl3
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 cb6902c..bcf56ae 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) {
</tfoot>
<tbody><tr>
<td>
- [% description %] [% title %]
+ [% individual_description %]
</td>
<td>[% accounttype %]</td>
<td>[% notify_id %]</td>
diff --git a/members/pay.pl b/members/pay.pl
index 8267f7c..8747dfa 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -173,6 +173,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 c68d205..5dd565c 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -61,6 +61,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 );
@@ -86,7 +87,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,