From e74208b8dc4b3cde2e5ff5f23184d15567e0796f Mon Sep 17 00:00:00 2001 From: Maryse Simard Date: Tue, 10 Dec 2019 13:58:45 -0500 Subject: [PATCH] Bug 24208: Remove change calculation for writeoffs Bug 11373 added change calculation to the payment page. This doesn't work very well in the case of writeoffs: - The "Amount paid" and "Change to give" fields don't make much sense in the case of writeoffs. - The amount for a partial writeoff has to be entered in the "Amount paid" field instead of the one labeled "Writeoff amount" just underneath. This patch removes these unwanted fields and use the "Writeoff amount" label on the right input. Test plan: 1) Choose a patron who has fees. You can add a manual invoice if necessary. 2) Go to Accounting > Make a payment. 3) Select some fines and click "Write off selected". 4) Note the form has a lot of inputs, not all are necessary for a writeoff. 5) Make a partial writeoff by entering a different amount in the "Writeoff amount" field. => The amount written off is the amount entered in the "Amount paid" field. 6) Apply patch. 7) Repeat steps 1-3. 8) Notice the form only has "Amount outstanding", "Writeoff amount" and "Note" fields, which are enough for a writeoff. 9) Entering any amount lower than or equal to the amount outstanding in the "Writeoff amount" field should create a writeoff of the selected amount. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/paycollect.tt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 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 a71eecaf2c..a07d185fac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -215,7 +215,7 @@
[% IF ( selected_accts ) %] - [% IF type == 'writeoff' %] + [% IF type == 'WRITEOFF' %] Write off an amount toward selected fines [% ELSE %] Pay an amount toward selected fines @@ -230,23 +230,23 @@ [% total | format('%.2f') %]
  • - - -
  • -
  • - [% IF type == 'writeoff' %] - + [% IF type == 'WRITEOFF' %] + [% ELSE %] - + [% END %] - -
  • -
  • - - 0.00 +
  • - [% IF type != 'writeoff' %] + [% IF type != 'WRITEOFF' %] +
  • + + +
  • +
  • + + 0.00 +
  • [% SET payment_types = AuthorisedValues.GetAuthValueDropbox('PAYMENT_TYPE') %] [% IF payment_types %]
  • -- 2.39.5