[koha-commits] main Koha release repository branch master updated. v19.11.00-666-g013edd90e3
Git repo owner
gitmaster at git.koha-community.org
Mon Feb 10 10:49:32 CET 2020
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 013edd90e31a871c4125cee3d6f48fd25af40138 (commit)
via caf1578be6ff8b0a85be468ef17a41cbe1876418 (commit)
via 51e341b56d4f066bb8b21b8d50ba663e6d8a82f9 (commit)
via 5ee37a812732ee3868d48ce75c5635fa53780e00 (commit)
via 30005cd2eae316515dde179202e647bbd1b0ec83 (commit)
via 125d8c2d8bf1e18e1b410d38b33970b9f407d46a (commit)
via be7ca413fd3cc3f9fadf1f879440859ce5175c02 (commit)
via f514a37d8815310f1608948db05bc129794946cc (commit)
via 9de9976cb279039a24749dc90853fee8330a0248 (commit)
via ed7c1b34533149b081d8b0e5bd320b40623bb136 (commit)
via a40912a507b69e3a11ff051d1e90e6dee52f7e5e (commit)
via d2cdd913faa56a2a20283d89c371eba33b574424 (commit)
via dfe3d784454310f4a7bef7da6bec50a074abf482 (commit)
via d31ee5980b2a52db6d1c60d9dd744f4584df3e40 (commit)
via 661e598d7035fe74b25e2d7ceef338fba38aa18d (commit)
from 99e2fbd0832bee58e84724cd19b74e683d10520f (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 013edd90e31a871c4125cee3d6f48fd25af40138
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 22 19:29:53 2019 +0000
Bug 11281: Printing holds awaiting pickup prints both tabs
This patch adds columns configuration to the holds awaiting pickup
tables. Doing so helps solve the printing issue by adding a "Print"
option to both tables. Using this print function will provide a
printable version of only that table.
To test you should have multiple holds in your system which are marked
"waiting" and some which have been waiting longer than the value
specified in the ReservesMaxPickUpDelay system preference.
Apply the patch and go to Circulation -> Holds awaiting pickup.
- On both the "Holds waiting" and "Holds waiting over..." tabs the
DataTable should display correctly and all the controls should work,
including the columns settings and the choices in the export menu.
- Confirm that the "Print" action creates a printable version of only
the table you are viewing.
- Go to Administration -> Columns settings -> Circulation.
- Change some visibility controls for the tables under the
"holds_awaiting_pickup" heading (id=holdso and id=holdst). Confirm
that these changes are reflected in the "Holds waiting" interface.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit caf1578be6ff8b0a85be468ef17a41cbe1876418
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jan 20 11:29:11 2020 -0300
Bug 24462: Adapt mapping to voted RFC (Invoices)
This trivial patch changes the attribute names for API reprensentation
of Koha::Acquisition::Invoice objects.
To test:
1. Open https://wiki.koha-community.org/wiki/Acquisitions_invoices_endpoint_RFC
2. Check the mappings are correct
=> SUCCESS: The patch makes the right changes to the mappings
3. Sign off :-D
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 51e341b56d4f066bb8b21b8d50ba663e6d8a82f9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon May 6 15:37:38 2019 -0500
Bug 22860: Remove 1 remaining patron after authentication.t is ran
Test plan:
0/ Do not apply the patch
1/ select count(*) from borrowers;
2/ Run the tests
=> Notice that you have 1 more patron
3/ Apply the patch and repeat 1/ and 2/
=> Notice that you have the same number of patrons before and after the
tests
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5ee37a812732ee3868d48ce75c5635fa53780e00
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Feb 3 17:31:42 2020 +0100
Bug 24516: Add account_type to the columns settings on boraccount
The column was missing from the yml file.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 30005cd2eae316515dde179202e647bbd1b0ec83
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jan 20 12:41:51 2020 +0000
Bug 13305: Remove tabindex from PrepareItemsRecordDisplay
Test plan:
Check the tab order of the item block on additem.pl (item editor),
Acquisition (neworderempty or addiso2709), serials-edit.pl.
You could also check services/itemrecorddisplay.pl and pass a
biblionumber; this script is used in additem.js for cataloguing and
acquisition.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 125d8c2d8bf1e18e1b410d38b33970b9f407d46a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Feb 7 16:52:52 2020 +0000
Bug 16719: (QA follow-up) Remove tabs
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit be7ca413fd3cc3f9fadf1f879440859ce5175c02
Author: Oliver Behnke <oliver.behnke at aei.mpg.de>
Date: Fri Feb 7 12:35:21 2020 +0000
Bug 16719: (follow-up) Update check on password mapping
Change to allow for unmapped default passwords
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit f514a37d8815310f1608948db05bc129794946cc
Author: Oliver Behnke <oliver.behnke at aei.mpg.de>
Date: Fri Feb 7 12:31:31 2020 +0000
Bug 16719: Pass through undef rather than empty string in LDAP mapping
Nullable DB fields should be passed null in cases where ldap fields are
empty and not replaced with empty strings.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9de9976cb279039a24749dc90853fee8330a0248
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Feb 10 09:15:51 2020 +0000
Bug 24525: (QA follow-up) Make payment type required with cash registers
The use of cash registers adds the requirement to enter a payment type,
this patch adds the required status when cash registers are configured.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ed7c1b34533149b081d8b0e5bd320b40623bb136
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jan 28 14:05:35 2020 +0000
Bug 24525: (follow-up) Factor out to an include
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a40912a507b69e3a11ff051d1e90e6dee52f7e5e
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Tue Jan 28 14:05:35 2020 +0000
Bug 24525: Remove SIP payment types from point of sale
This patch removes the SIP payments types from displaying in the select
options on the point of sale payment page.
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d2cdd913faa56a2a20283d89c371eba33b574424
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 14 10:50:24 2019 +0100
Bug 23640: Flushing L1 on every SIP connection
This patch flushes the L1 cache on each SIP connection
(ie every invocation of process_request).
This means each SIP connection will fetch values from the
L2 cache (ie memcached) and persist the L1 cache (in Perl
memory cache) only until a new SIP connection comes in.
Without this patch, the L1 cache persists for the length
of the server process, which means the L1 cache will become
stale very quickly, which can lead to unexpected behaviour.
Test plan:
1. Enable IssueLog
2. Start SIP server
2a. change to Koha git directory
2b. koha-shell kohadev
2c. perl C4/SIP/SIPServer.pm /etc/koha/sites/kohadev/SIPconfig.xml
3. Issue book via SIP
perl misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron 1 --item 3999900000001 -m checkout
4. Check action_logs for "CIRCULATION ISSUE <borrowernumber> <biblionumber>" line
http://localhost:8081/cgi-bin/koha/tools/viewlog.pl
5. Disable IssueLog
6. Check in the book and then check it out again
perl misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron 1 --item 3999900000001 -m checkin
perl misc/sip_cli_emulator.pl -a 127.0.0.1 -p 6001 -su term1 -sp term1 -l CPL --patron 1 --item 3999900000001 -m checkout
7. Check action_logs for "CIRCULATION ISSUE <borrowernumber> <biblionumber>" line
http://localhost:8081/cgi-bin/koha/tools/viewlog.pl
8. Note results
Without the patch, you'll see a 2nd checkout.
With the patch, you won't see the 2nd checkout.
(Note: After applying the patch, you have to restart the SIP server.)
Signed-off-by: David Cook <dcook at prosentient.com.au>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dfe3d784454310f4a7bef7da6bec50a074abf482
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jan 27 14:56:35 2020 +0000
Bug 24482: Fix for formatted price issue with value over 1000
This patch for the point of sale feature fixes an issue where items for
purchase with a value of $1,000 or more break the payment calculations.
Test plan:
1) Enable the point of sale feature
(EnablePointOfSale + UseCashRegisters system preferences)
2) Add a cash register for a library
(Home > Point of sale > Cash registers > New cash register)
3) Create a purchase item with a cost of $1000
(Home > Point of sale > Purchase items > New debit type)
4) Go to to the point of sale page and attempt to sell one of your items
(Home > Point of sale > click 'Add' next to the item to purchase)
5) Note that Koha inserts a comma into the price in the list of items for
purchase
6) Note that the 'Amount being paid' changes to 0.00 instead of $1,000,
which affects the other calculations
7) Apply the patch
8) Repeat step 4
9) Amount being paid and other calculations should now be correct
10) Enter an amount for 'Collected from patron' and click 'Confirm'
check that the change calculation is correct.
11) Sign-off the patch!
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d31ee5980b2a52db6d1c60d9dd744f4584df3e40
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Feb 6 11:10:39 2020 -0300
Bug 24602: Make get_onshelfholds_policy fallback to 0
The onshelfholds circulation rules values are more of an ENUM type (as
opposed to other rules with integers like max*qty). In the
quantities cases, it makes sense to have undef mean unlimited. In the
enum type it is clearer to just set a default value (0) as the code
already expects (Note: undef and 0 both eval to false so there's no
behaviour problem, but warnings or we get forced to check for
defined when the rule is used. It seems trivial to just make the
rule fallback to a chosen default value).
This patch makes it fallback to 0.
To test:
1. Run:
$ kshell
k$ prove t/db_dependent/Koha/CirculationRules.t \
t/db_dependent/Reserves.t
=> FAIL: CirculationRules.t fails and Reserves.t prints a warning
2. Apply this patch
3. Repeat (1)
=> SUCCESS: Tests pass! No warning!
4. Sign off :-D
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 661e598d7035fe74b25e2d7ceef338fba38aa18d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Thu Feb 6 11:09:12 2020 -0300
Bug 24602: Tests for get_onshlefholds_policy
Ths patch introduces tests for get_onshelf_policy.
To test:
1. Apply this patch
2. Run:
$ kshell
k$ prove t/db_dependent/Koha/CirculationRules.t
=> FAIL: Tests fail because the current code returns undef instead of 0
Signed-off-by: David Nind <david at davidnind.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth_with_ldap.pm | 6 +--
C4/Items.pm | 10 ++---
C4/SIP/SIPServer.pm | 4 ++
Koha/Acquisition/Invoice.pm | 4 +-
Koha/CirculationRules.pm | 2 +-
admin/columns_settings.yml | 51 ++++++++++++++++++++++
.../intranet-tmpl/prog/en/includes/payments.inc | 23 ++++++++++
.../prog/en/includes/waiting_holds.inc | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 32 ++++++++++----
.../prog/en/modules/members/paycollect.tt | 39 +++--------------
koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt | 22 ++--------
t/db_dependent/Koha/CirculationRules.t | 38 +++++++++++++---
t/db_dependent/selenium/authentication.t | 2 +
13 files changed, 159 insertions(+), 76 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/payments.inc
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list