[koha-commits] main Koha release repository branch master updated. v3.14.00-972-g0456f6a
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 30 18:49:43 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 0456f6ade08d3d741d5da6eb912c0f40e08deb8b (commit)
via c8e99f313fe19dea6b11ed5fc05231e86283edf7 (commit)
from 7b295e9dd7a1f2a9b1d1cf1882edbc2a0e70fe3a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0456f6ade08d3d741d5da6eb912c0f40e08deb8b
Author: Galen Charlton <gmc at esilibrary.com>
Date: Wed Apr 30 17:11:58 2014 +0000
Bug 6273: (follow-up) fix various issues
This patch fixes various issues that prevented the account
type from being set correctly when recording SIP2 payments:
- the fixed fields in the fee paid message were not getting
parsed correclty
- accountlines.accounttype is only five characters wide, so
SIP2 payments are now records as 'Pay00', 'Pay02', etc. rather
than 'Pay-00'.
- removed regression on bug 2546 and made the new payment types
translatable
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit c8e99f313fe19dea6b11ed5fc05231e86283edf7
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Dec 2 10:49:07 2011 -0500
Bug 6273: add support for recording type of payment made via SIP2
Adds support for recording in Koha accountlines a different accounttype
depending on how the fee was paid at the SIP2 station (cash, credit,
etc.)
Adds a new param to recordpayment(), $sip_paytype, which is appended to
the 'Pay' type if present. The payment description is also appended
with " (via SIP2)" if this is present.
In order for other scripts to keep working as expected, "eq 'Pay'"
needed to be replaced with a regex comparison "=~ /^Pay/", so that 'Pay'
and 'Pay-##' would continue to group together.
To test:
1. Make a payment over a SIP2 connection
2. Check the patron record in the staff client; you should see the
modified description
3. Attempt to print a invoice or a reciept for the borrower; the
payment should show up where expected
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 18 ++++++++++++------
C4/SIP/ILS.pm | 2 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 3 ++-
C4/SIP/Sip/MsgType.pm | 2 +-
.../prog/en/modules/members/boraccount.tt | 3 +++
.../intranet-tmpl/prog/en/modules/members/pay.tt | 3 +++
koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tt | 3 +++
members/boraccount.pl | 2 +-
members/printfeercpt.pl | 2 +-
members/printinvoice.pl | 2 +-
10 files changed, 28 insertions(+), 12 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list