[koha-commits] main Koha release repository branch master updated. v18.05.00-1244-g8f6bd94
Git repo owner
gitmaster at git.koha-community.org
Wed Oct 31 16:15:31 CET 2018
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 8f6bd9415096924e2648a1a0a5866733f6839760 (commit)
via 62613b6cf2861c28862ec9a6d55767eff63d2322 (commit)
via 655caa61e64af3c1fdb12a3a01f28f8d07752609 (commit)
via 8193d3592d815066943cba5807ef6d80c0f7d366 (commit)
via 00d5ceac1e56edc4ce893c53b0ea6763e9fca5e2 (commit)
via 04114d4b835c10bb03b9c092268fc632d5552fed (commit)
via b7b6727f92615bcebf2f037202e6647a34c7705a (commit)
via 77ea4686395f88c9678c611a78e6db4fd4c04101 (commit)
via 74f2a9032475dcfd18141655bd2ef608c4c65801 (commit)
via efc92a5ea2fc0aed90cc93dae1a0024c886fd80a (commit)
via f7ec3b5ab661cfeb3bdb2a1600ac85baf7c422b7 (commit)
via aced7b10de6180da18e1cce86d5d020bd9dd4813 (commit)
via 7cecc27e0152e310a7286ddd9bab96597b91891e (commit)
via 676fbe12ea52e2d3552b7d5300ba278de4ac3437 (commit)
via cc12509c1e61c0648b57fc39b3428bb2169e303c (commit)
via 9f65d3422ee2fe7df556e422b9d1ed3cddc5be38 (commit)
via 52028d9932ce1d10ad690261d8f6983b074b2909 (commit)
via 559e051bb9eecbc92f63aa2941caea6ee373fe0e (commit)
via bffd0d8f11fd68e7706e57c571c9b29d15d800ea (commit)
via a140843721de52477c6460ccca0c1bf0d0aafcfd (commit)
via 8bdde434657121e884103048d64cfde86a57bf8b (commit)
via 217c8a656f8ba46aa12e5e21f3d0d86132950788 (commit)
via 541a90765ccb4ab29ac43eefbc5e17de9764bc84 (commit)
via 6093e08443b393a3983778b4f92d0df56d419cd9 (commit)
via da2a8c7b18811e67d78a5e6e81fd93039ae3af5e (commit)
via a90502043f12055b7e6b61f9c23d924d2e02b999 (commit)
via 466e29263910c85ce6417f322dc505558eeaa8a3 (commit)
via e1b73ad7cb970a52a6191aa5c73b7491db537327 (commit)
via 5c90aae36a36cabae004b03f0b71f30883ac2e8c (commit)
via 3db4926db3ba6c49d29d36d450b7c689d207e091 (commit)
via 7dd4d60c8a9118e13b02b4dc60612df4cbc95f91 (commit)
via 0fb422d8f9dba77edde17d18eeac6471c7245730 (commit)
via 9acfe172574d91da9b6724c1b9e61a00a0017271 (commit)
from 0275c36d962a284453c36b0472a3a5ef87329fc6 (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 8f6bd9415096924e2648a1a0a5866733f6839760
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 26 15:19:36 2018 -0300
Bug 21681: Improve the account lines fetch
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 62613b6cf2861c28862ec9a6d55767eff63d2322
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 26 15:25:09 2018 -0300
Bug 21681: Add tests for GetPatronInfo
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 655caa61e64af3c1fdb12a3a01f28f8d07752609
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Fri Oct 26 10:05:11 2018 +0000
Bug 21681: Remove C4::Accounts::getcharges
Test plan:
0) Do not apply the patch
1) Enable ILS-DI
2) Go to
<opac_url>/cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=51&show_fines=1
use patron with some paid and unpaid fines
3) Save the page for later usage
4) Apply the patch
5) Repeat 2 with same patron and compare the saved result with the new
one, they should be same
6) git grep getcharges should return no occurance
7) prove t/db_dependent/Accounts.t
Co-authored-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8193d3592d815066943cba5807ef6d80c0f7d366
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 26 15:08:51 2018 -0300
Bug 21694: Keep the context
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 00d5ceac1e56edc4ce893c53b0ea6763e9fca5e2
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Oct 26 18:34:35 2018 +0100
Bug 21694: Add the Koha::Account->lines method
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 04114d4b835c10bb03b9c092268fc632d5552fed
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 29 19:59:00 2018 +0000
Bug 21698: (QA follow-up) Fix typo verbosev -> verbose
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit b7b6727f92615bcebf2f037202e6647a34c7705a
Author: Magnus Enger <magnus at libriotech.no>
Date: Fri Oct 26 22:47:16 2018 +0200
Bug 21698: Fix POD of cancel_unfilled_holds.pl
To test:
- Run "perldoc misc/cronjobs/holds/cancel_unfilled_holds.pl"
- Notice some problems:
-- No description in the NAME section
-- Descriptions of options in the SYNOPSIS section
-- A literal head1
-- Long options are listed with a single leading dash
-- Options --verbose and --confirm are not listed under OPTIONS)
- Take a look at the script itself to see that --verbose and
--confirm should be listed.
- Also note the typo on line 97: 'v|verbosev' => \$verbose,
- Apply the patch
- Look at the script and perldoc again and check that all problems
described above are now fixed.
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 77ea4686395f88c9678c611a78e6db4fd4c04101
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Jun 5 11:55:12 2017 +0200
Bug 18720: Use exception instead of die in GetBasketAsCsv
Test plan:
prove t/db_dependent/Acquisition/GetBasketAsCSV.t
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 74f2a9032475dcfd18141655bd2ef608c4c65801
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Mon Oct 8 13:33:46 2018 +0100
Bug 20941: (follow-up) Switch 'media' -> 'types'
Clearing up the inconsistency mentioned in comment #35. There is one
place where we use the term 'media' for a template variable, everywhere
we refer to material types as 'types'.
NOTE: This is a breaking change for existing backends that still use
'media'. Of the PTFS Europe backends, only the Koha backend uses it,
this will be modified as necessary. Generally backends will supply this
variable themselves, so the breaking-ness of this change should be
minimal.
No test plan as it's backend dependent.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit efc92a5ea2fc0aed90cc93dae1a0024c886fd80a
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Fri Oct 5 08:56:45 2018 +0100
Bug 20941: (follow-up) Update N/A handling
Modify the conditional display of N/A in accordance with comment #17
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit f7ec3b5ab661cfeb3bdb2a1600ac85baf7c422b7
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Oct 4 13:38:20 2018 +0100
Bug 20941: (follow-up) Wrap N/A strings in <span>
All N/A strings in ILL templates wrapped in <span> to aid translation
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit aced7b10de6180da18e1cce86d5d020bd9dd4813
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Thu Oct 4 07:44:53 2018 +0000
Bug 20941: (QA follow-up) Fix return value of get_type, make templates more consistant
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7cecc27e0152e310a7286ddd9bab96597b91891e
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Wed Oct 3 12:05:40 2018 +0100
Bug 20941: (follow-up) Carry out comment #4 advice
- Switch getType -> get_type
- get_type now returns a type or undef
- Ternary now performed in template
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 676fbe12ea52e2d3552b7d5300ba278de4ac3437
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Tue Oct 2 15:50:51 2018 +0100
Bug 20941: Add unit tests
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cc12509c1e61c0648b57fc39b3428bb2169e303c
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date: Thu Jun 14 14:26:02 2018 +0100
Bug 20941: Add Illrequest->getType method
This patch adds a method to the Illrequest object enabling it to return
its type, which is stored as an Illrequestattribute object
To observe broken state:
- Do not apply patch
- Ensure you have at least one Interlibrary loan created
- In OPAC view, go to "your interlibrary loan requests"
- => TEST: Observe that the "Request type" column is not populated
- Click on "View" for one of the requests
- => TEST: Observer that the "Request type" row is not populated
- In Staff view, go to "ILL requests"
- Click on "Manage request" on a request
- => TEST: Observer that the "Request type" row is not populated
To Test:
- Apply patch
- In OPAC view, go to "your interlibrary loan requests"
- => TEST: Observe that the "Request type" column IS populated
- Click on "View" for one of the requests
- => TEST: Observer that the "Request type" row IS populated
- In Staff view, go to "ILL requests"
- Click on "Manage request" on a request
- => TEST: Observer that the "Request type" row IS populated
Signed-off-by: Niamh.Walker-Headon at it-tallaght.ie
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9f65d3422ee2fe7df556e422b9d1ed3cddc5be38
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 31 13:34:43 2018 +0000
Bug 10442: Compiled CSS
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 52028d9932ce1d10ad690261d8f6983b074b2909
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 13 13:39:42 2018 +0000
Bug 10442: Remove references to non-standard "error" class
The CSS for <div class="error"> is obsolete and should not be used. This
patch removes the definition from the main CSS file and corrects
instances of its use in the templates to the standard <div class="dialog
alert">.
To test:
- In Acquisitions -> Late orders, locate an order from a vendor which
doesn't have an email address. Selecting that order and clicking
"Claim" should trigger an error dialog, "This vendor has no email." It
should be styled correctly.
- With AcqCreateItem set to "when placing an order," add to an existing
order using the "From a new (empty) record" option. Add two items with
identical barcodes and submit the form. A error should show at
the top of the page.
- With AcqCreateItem set to "when receiving an order," receive an order
and add two items with identical barcodes. Submitting the form should
trigger an error message at the top of the page.
With the remaining cases I don't know how to trigger the errors in
question, so a visual check of the changes may be required:
- Administration -> Funds -> "You are not authorized to modify this
fund"
- Administration -> Search engine configuration
(/admin/searchengine/elasticsearch/mappgings.pl) -> Various
modification errors.
- With the AutoEmailOpacUser preference set to "send," adding a patron
without an email address can trigger an error, "This member has no
email."
- With plugins enabled, and installed, there are error messages
displayed under various circumstances.
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 559e051bb9eecbc92f63aa2941caea6ee373fe0e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 29 19:23:53 2018 -0300
Bug 21080: Fix patron's attributes display when PA_CLASS is used
When a patron attribute class (AV PA_CLASS) is created, the patron's
edit view is broken:
https://screenshots.firefox.com/62uNhoUtH6rPXm9l/pro.kohadev.org
To recreate:
1. Create 1+ authorised values PA_CLASS
2. Create patron's attributes using it
3. Edit a patron
it depends on the order of the fieldset and the ol elements
This is certainly not the best fix but the display does not look broken!
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit bffd0d8f11fd68e7706e57c571c9b29d15d800ea
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Fri Oct 26 18:13:10 2018 +0300
Bug 14716: Fix more unencoded url parameters.
Fixes issues found during QA and unifies the SubfieldSelect function across the utils xsl's.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a140843721de52477c6460ccca0c1bf0d0aafcfd
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Sat Sep 15 01:32:07 2018 +0300
Bug 14716: URI-encode URLs in NORMARC xsl templates.
https://bugs.koha-community.org/show_bug.cgi?id=14716
Test plan:
1. Catalog a record with series name "Series & more"
2. Find the record
3. Make sure clicking the "Series & more" link works and the ampersand is properly encoded in the URL.
Signed-off-by: Magnus Enger <magnus at libriotech.no>
Works as advertised.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 8bdde434657121e884103048d64cfde86a57bf8b
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Thu Feb 22 15:37:25 2018 +0200
Bug 14716: URI-encode URLs in UNIMARC xsl templates.
https://bugs.koha-community.org/show_bug.cgi?id=14716
Test plan:
1. Catalog a record with series name "Series & more"
2. Find the record
3. Make sure clicking the "Series & more" link works and the ampersand is properly encoded in the URL.
4. Also try the attached test records and make sure their links work.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 217c8a656f8ba46aa12e5e21f3d0d86132950788
Author: Ere Maijala <ere.maijala at helsinki.fi>
Date: Thu Feb 22 15:37:25 2018 +0200
Bug 14716: URI-encode URLs in MARC21 xsl templates.
https://bugs.koha-community.org/show_bug.cgi?id=14716
Test plan:
1. Catalog a record with series name "Series & more"
2. Find the record
3. Make sure clicking the "Series & more" link works and the ampersand is properly encoded in the URL.
4. Also try the attached test records and make sure their links work.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 541a90765ccb4ab29ac43eefbc5e17de9764bc84
Author: Josef Moravec <josef.moravec at gmail.com>
Date: Mon Oct 29 22:35:57 2018 +0000
Bug 21581: (QA follow-up) Update comment according to code in SearchAuthorities
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 6093e08443b393a3983778b4f92d0df56d419cd9
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 16 15:09:32 2018 +0000
Bug 21581: Pass through authorities indexes
To test:
1 - Define a rule:
Matching rule code: LCAUTH
Match threshold: 100
Record type: Authority record
MATCH POINTS
Search index: LC-card-number
Score: 100
Tag: 010
Subfield: a
2 - Have a record with an LC number in 010
3 - Export it
4 - Edit the record in Koha, move the value from 010 to another field
5 - Import the original record
6 - Use the matching rule above, you expect it won't match (nothing in 010 anymore)
7 - It matches?!?!?!
8 - Enable zebra logging in koha-conf.xml
<zebra_loglevels>none,fatal,warn,request,info</zebra_loglevels>
9 - tail -f /var/log/koha/kohadev/zebra-output.log
10 - On manage marc apply matchign with no rule, then reapply with rule
11 - View the output in the log - the index searched is 'Any'
12 - Apply patch
13 - Reapply matching
14 - Note we search the expected index and no match is found
NOTE: By applying bug 21579, I was able to view the difference, and
see that it didn't match identically, because I had moved the
value from 010 to 155. No log checking needed. clean/delete batch.
Apply patch, no match. clean/delete batch.
Edit authority back, matches.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit da2a8c7b18811e67d78a5e6e81fd93039ae3af5e
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Wed Oct 24 11:53:07 2018 +0000
Bug 21581: Unit tests and updated data
To test:
1 - Apply this patch only
2 - prove -v t/db_dependent/Search.t
3 - It fails
4 - Apply second patch
5 - prove -v t/db_dependent/Search.t
6 - It passes!
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit a90502043f12055b7e6b61f9c23d924d2e02b999
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Oct 27 09:22:00 2018 -0300
Bug 21702: (follow-up) Simplify checks and use standard fallback behaviour
This patch acknowledges the fact that some checks here are done in a way
that is not standard these days. This checks are originally done
multiple times in different ways. output_and_exit_if_error should be
used.
This implies a minor behaviour change: if the passed (in the URL)
borrowernumber doesn't exist, it sends the user to a 'Patron doesn't
exist page' instead of the circulation page for the borrowernumber.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 466e29263910c85ce6417f322dc505558eeaa8a3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Oct 27 09:11:33 2018 -0300
Bug 21702: Make mancredit.pl use the patron id for the staff user
I think unsafe SQL modes and the fact that manager_id has no FK allowed this to go unnoticed. But now we catch it!
To test:
- On a patron, try adding a new manual credit of any type
=> FAIL: It fails telling the userid of the logged user is not a valid integer!
- Apply this patch
- Try adding a manual credit of any type
=> SUCCESS: Manual credit added!
- Sign off!
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e1b73ad7cb970a52a6191aa5c73b7491db537327
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Sat Oct 27 08:34:39 2018 -0300
Bug 13098: Fix POD for Koha::Account::Offsets::total
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 5c90aae36a36cabae004b03f0b71f30883ac2e8c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 25 16:13:27 2018 -0300
Bug 13098: Sum at DBMS level
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 3db4926db3ba6c49d29d36d450b7c689d207e091
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 25 16:06:14 2018 -0300
Bug 13098: Do not compare with precision
Formating will be done TT side
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 7dd4d60c8a9118e13b02b4dc60612df4cbc95f91
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 18 13:08:42 2018 -0300
Bug 13098: Make _FixAccountForLostAndReturned refund the right thing
This patch changes the logic inside the method, to make it match the
behaviour described on the tests.
It uses the existing offsets on the account_offsets table to gather
information about the right things to refund.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> FAIL: Tests don't pass!
- Apply this patch
- Run
k$ prove t/db_dependent/Circulation.t
=> SUCCESS: Tests pass!
- Sign off :-D
Followed test plan, patch works as described. All three patches pass QA
test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 0fb422d8f9dba77edde17d18eeac6471c7245730
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Oct 12 10:27:06 2018 -0300
Bug 13098: Tests for all _FixAccountForLostAndReturned use cases
This patch introduces tests for all the use cases for
_FixAccountForLostAndReturned. This includes the following scenarios
before _FixAccountForLostAndReturned is called:
- Full write off (the original issue)
- Full payment
- No payment or write off
- Partial payment and partial write off
Written off debts (L lines) are just skipped, any kind of payment is
added and then refund as a single credit (CR). Amount outstanding is set
to 0. Offsets need to be generated for paper trail of this decisions.
To test:
- Run:
$ kshell
k$ prove t/db_dependent/Circulation.t
=> FAIL: Tests fail because _FixAccountForLostAndReturned is not doing
the right thing :-D
Followed test plan, patch works as described
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 9acfe172574d91da9b6724c1b9e61a00a0017271
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Oct 18 12:57:33 2018 -0300
Bug 13098: Add Koha::Account::Offsets->total
This patch introduces this trivial method for returning the sum0 result
of the amount columns of a Koha::Account::Offsets set.
To test:
- Apply this patch
- Run:
$ kshell
k$ prove t/db_dependent/Koha/Account/Offsets.t
- Sign off :-D
Followed test plan, patch worked as described
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 18 --
C4/Acquisition.pm | 3 +-
C4/AuthoritiesMarc.pm | 4 +-
C4/Circulation.pm | 60 ++--
C4/ILSDI/Services.pm | 6 +-
Koha/Account.pm | 18 ++
Koha/Account/Offsets.pm | 28 ++
Koha/Illrequest.pm | 15 +
ill/ill-requests.pl | 2 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 7 -
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../prog/en/modules/acqui/lateorders.tt | 6 +-
.../prog/en/modules/acqui/neworderempty.tt | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 2 +-
.../admin/searchengine/elasticsearch/mappings.tt | 4 +-
.../prog/en/modules/ill/ill-requests.tt | 6 +-
.../prog/en/modules/members/memberentrygen.tt | 14 +-
.../prog/en/modules/plugins/plugins-home.tt | 8 +-
.../intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 60 ++--
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 9 +-
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 30 +-
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 42 +--
.../prog/en/xslt/NORMARCslim2intranetResults.xsl | 27 +-
.../prog/en/xslt/NORMARCslimUtils.xsl | 26 +-
.../prog/en/xslt/UNIMARCslim2intranetResults.xsl | 2 +-
.../prog/en/xslt/UNIMARCslimUtils.xsl | 21 +-
koha-tmpl/intranet-tmpl/prog/js/additem.js | 10 +-
.../bootstrap/en/modules/opac-illrequests.tt | 10 +-
.../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 60 ++--
.../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
.../bootstrap/en/xslt/MARC21slimUtils.xsl | 30 +-
.../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 46 +--
.../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 12 +-
.../bootstrap/en/xslt/NORMARCslimUtils.xsl | 27 +-
.../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 2 +-
.../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 27 +-
members/mancredit.pl | 98 +++---
misc/cronjobs/holds/cancel_unfilled_holds.pl | 38 ++-
opac/opac-illrequests.pl | 2 +-
t/db_dependent/Accounts.t | 1 -
t/db_dependent/Acquisition/GetBasketAsCSV.t | 14 +-
t/db_dependent/Circulation.t | 329 +++++++++++++++++---
t/db_dependent/ILSDI_Services.t | 12 +-
t/db_dependent/Illrequests.t | 15 +-
t/db_dependent/Koha/Account.t | 35 ++-
t/db_dependent/Koha/Account/Offsets.t | 70 +++++
t/db_dependent/Search.t | 7 +-
.../marc21/zebraexport/authority/exported_records | 2 +-
50 files changed, 908 insertions(+), 367 deletions(-)
create mode 100755 t/db_dependent/Koha/Account/Offsets.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list