[koha-commits] main Koha release repository branch master updated. v3.18.00-251-g522e9c58
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 5 18:50:27 CET 2015
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 522e9c5861854fad7c9b292f75ebd19968f5b11c (commit)
via 74640683f0d7f4b9734a69763424b33977f66cfd (commit)
via 01c7c2a12904fae5076914d839c5e829c54deb6f (commit)
via bfb035511e8afd6716ea8d1b2de966f8950b74e6 (commit)
via 6f57a2e09b7e9a87270eba1b04f75ae22fbbc999 (commit)
via 42e9044f1195a512870d4e1dc01679a64d47f4d9 (commit)
via f27d454048bca9d9ebdc1f781a688c2311952786 (commit)
via 724f77ec43449144a2cccac048a57ffb19799fed (commit)
via d85f757ce7bf446705a8d76bc0d2280705a2d88d (commit)
via fee7bd7fdc822939b03a68db8cce61ab07db1893 (commit)
via 03335ab401576355dfc5bcee1aa45714fd9fc411 (commit)
via f4f1f5a3b3b750a2854d29962048c297c330f57b (commit)
from 02b70129c94a0c77d4a3d6f81c88ac92c5a3561c (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 522e9c5861854fad7c9b292f75ebd19968f5b11c
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Nov 10 10:45:25 2014 +0100
Bug 12905: funds with children could not be deleted
The interface should prevent to delete funds with children.
Otherwise the relationship is broken and problems occur:
1/ You don't see the orphan fund in the fund list
2/ You cannot edit the orphan fund amount ('Fund amount exceeds parent
allocation').
This patch:
- adds a JS check, template side
- adds a check in the perl script (should never be true)
- adds an updatedatabase check, in order to alert users with inconsistent data.
Test plan:
Verify you are not allow to delete a fund with children.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 74640683f0d7f4b9734a69763424b33977f66cfd
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 25 12:23:45 2014 +0100
Bug 13333: Fix Display basket group for already received orders
Bug 11111 adds a basket group column on the parcel page.
But it seems that the already received orders never contain the value
(always 'no basket group').
Test plan:
Receive an order which is in a basket group and verify the basket group
column is correctly filled.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 01c7c2a12904fae5076914d839c5e829c54deb6f
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 19 12:28:19 2014 -0500
Bug 13457 - Followup for CPL and S codes
Based on comment #3, this corrects CPL and S issues if they do
not exist in the DB.
TEST PLAN
---------
0) Backup your DB.
1) Clear CPL and S from your DB.
- delete from borrowers where categorycode='S';
- delete from categories where categorycode='S';
- delete from borrowers where branchcode='CPL';
- delete from branch where branchcode='CPL';
2) prove t/db_dependent/Suggestions.t
-- This should fail.
3) Apply patch
4) prove t/db_dependent/Suggestions.t
-- This should work.
5) Intentionally add categorycode 'S' and branchcode 'CPL' back
into the database.
6) prove t/db_dependent/Suggestions.t
-- This should work.
7) run koha qa test tools.
8) Restore your DB :)
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bfb035511e8afd6716ea8d1b2de966f8950b74e6
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Dec 12 17:03:17 2014 -0500
Bug 13457: Suggestions.t expects sample itemtypes
TEST PLAN
---------
1) Make sure you have more than 8 item types, and preferably
something with a non-sample default code for itemtypes.
2) prove t/db_dependent/Suggestions.t
-- this will fail
3) Apply patch
4) prove t/db_dependent/Suggestions.t
-- this will succeed
5) run koha qa test tools
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 6f57a2e09b7e9a87270eba1b04f75ae22fbbc999
Author: Thomas <tomsStudy at gmail.com>
Date: Thu Jan 15 01:43:28 2015 +0000
Bug 10241 - Easy analyticals creates two 773 fields. Search/link from host to children is broken
Hidden 'New child record' if 'EasyAnalytics' is set to display.
Testing plan:
-Turn on 'EasyAnalytics'. Check the drop down menu from the records page
*The drop down menu should include 'Analyze items' and not include 'New child record'
-Turn off 'EasyAnalytics'. Again check the drop down menu from the records page
*The drop down menu should include 'New child record' and not inlucde 'Analyze items'
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: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 42e9044f1195a512870d4e1dc01679a64d47f4d9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Dec 11 09:50:38 2014 +0100
Bug 13268: the size should not be emptied in pl script
It duplicates what the first patch does.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f27d454048bca9d9ebdc1f781a688c2311952786
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Nov 17 16:32:20 2014 +0100
Bug 13268 - biblioitems.size value not correctly displayed (more)
Bug partially corrected by Bug 11357.
The size column in biblioitems is a bit problematic when used in TT, because instead of the size value from the biblio column it will give you the size of the variable or current loop.
It's currently used in the templates like opac-topissues.tt :
[% IF results_loo.size %][% results_loo.size %][% END %]
This patch corrects by using item() TT method.
See http://stackoverflow.com/questions/2311303/how-can-i-handle-hash-keys-containing-illegal-identifier-characters-in-template.
Test plan :
- Be sure there is a mapping between a MARC field and biblioitems.size
- Create a record A with biblioitems.size defined : like "10x12"
- Create a record B with no value in biblioitems.size
- Check each modified page :
=> Without this patch : you see a number (loop size) for both records
=> With this patch : you only see the correct value for A and nothing for B
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 724f77ec43449144a2cccac048a57ffb19799fed
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 22 14:25:29 2015 -0500
Bug 13339 - Cart button doesn't open the cart
The link to open the cart no longer triggers the cart popup. Instead, in
order to make it more usable with mobile devices, it triggers a menu
which displays the count of items in the cart -- something which
previously was done with a hover action (something touch-screen devices
don't have). Clicking/tapping this menu item is what opens the cart
window.
Since the cart link is really now a menu trigger rather than just a
link, it seems logical to add the small arrow which the lists link
has indicating that the link triggers a menu.
To test, apply the patch and view any page in a Cart-enabled OPAC.
Confirm that the "caret" icon displays correctly when the cart is both
empty and when it has contents.
Followed test plan. Icon displays as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, good idea.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d85f757ce7bf446705a8d76bc0d2280705a2d88d
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Thu Oct 30 15:36:09 2014 +0000
Bug 7904 Change SIP modules to use standard LIB path
For historical reasons the SIPServer and SIP modules
have used an extra module path in addition to the
standard Koha one. This has caused numerous irritants
in attempting to set up scripts and basic tests. It
does not help in attempting to modify or debug
this code
This patch changes the package value in the modules
under the C4/SIP directory and makes calls to
them use the full package name.
Where the export mechanism was being short circuited
routines have been explicitly exported and imported
declarations of 'use ILS' when that module was
not being used and which only generated warnings
have been removed.
As a lot of the changes affect lines where
an object is instantiated with new. The opportunity
has been taken to replace the ambiguous indirect
syntax with the preferred direct call
In intializing ILS the full path is added as this
will not require any changes to existing configs.
I suspect this feature is unused, and adds
obfuscation rather than flexibility but have kept
the feature as we need this change in order to
rationalize and extend the testing of the server.
The visible difference is that with the normal Koha
PERL5LIB setting. Compilation of Modules under C4/SIP
should be successful and not fail with unlocated modules,
allowing developers to see any perl warnings
All the SIP modules can now be run through the tests
in t/00-load.t now except for SIPServer itself
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit fee7bd7fdc822939b03a68db8cce61ab07db1893
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Mon Nov 10 11:38:29 2014 +1300
Bug 7904 - remove unnecessary path from SIP script
With the fixing of the namespace in the SIP code, we don't need to
modify the PERL5LIB to have the old one.
To test:
* do a package install using this and the other patches on bug 7904
* enable SIP
* make sure koha-start-sip and koha-stop-sip work
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 03335ab401576355dfc5bcee1aa45714fd9fc411
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Dec 10 12:27:59 2014 -0500
Bug 13432 - SIP Server does not respect timeout setting
Koha's SIP server accepts timeout parameters, but those parameters
are only used for the login portion of a telnet transport session.
Other than that, they are ignored, and as long as whatever opened
the connection keeps it open, it will stay open indefinitely.
Test Plan:
1) Set the timeout setting on your SIP server to 10 seconds
2) Modify misc/sip_cli_emulator.pl, add "sleep 100;" directly after line 91
3) Start your SIP server
4) Run the modified sip script with valid parameters
5) Watch the SIP server stderr
6) Note that even though the script waits far too long before continuing,
the SIP server never kills the connection, and the requests the cli
script makes come back with valid data.
7) Apply this patch
8) Restart your SIP server
9) Repeat step 4
10) Note that this time you see "SIP Timed Out!" in the SIP server
stderr and when the script finally makes it's request, it doesn't
come back with valid data.
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f4f1f5a3b3b750a2854d29962048c297c330f57b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Sep 22 16:09:14 2014 +0200
Bug 12975: Use the centralize VAT and prices calculation - basketgroup.pl
Bug 12969 introduces a subroutine to centralize VAT and prices
calculation.
It should be use in the acqui/basketgroup.pl script.
Test plan:
0/ Don't apply the patch
1/ Create 4 suppliers with the different configurations
2/ Create a basket and create several orders
3/ Close the basket and create the corresponding basket groups.
4/ Print the basket group
5/ Verify you don't see any difference before and after applying the
patch on the pdf file.
Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Works as described, passes tests and QA script.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 14 ++--
C4/SIP/ILS.pm | 72 +++++++++---------
C4/SIP/ILS/Item.pm | 6 +-
C4/SIP/ILS/Patron.pm | 2 +-
C4/SIP/ILS/Transaction.pm | 2 +-
C4/SIP/ILS/Transaction/Checkin.pm | 7 +-
C4/SIP/ILS/Transaction/Checkout.pm | 7 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 5 +-
C4/SIP/ILS/Transaction/Hold.pm | 7 +-
C4/SIP/ILS/Transaction/Renew.pm | 6 +-
C4/SIP/ILS/Transaction/RenewAll.pm | 8 +-
C4/SIP/SIPServer.pm | 29 +++++---
C4/SIP/Sip.pm | 6 +-
C4/SIP/Sip/Checksum.pm | 2 +-
C4/SIP/Sip/Configuration.pm | 14 ++--
C4/SIP/Sip/Configuration/Account.pm | 2 +-
C4/SIP/Sip/Configuration/Institution.pm | 2 +-
C4/SIP/Sip/Configuration/Service.pm | 2 +-
C4/SIP/Sip/Constants.pm | 2 +-
C4/SIP/Sip/MsgType.pm | 78 ++++++++++----------
C4/SIP/example_institution_dump.sh | 8 +-
C4/SIP/interactive_item_dump.pl | 4 +-
C4/SIP/interactive_patron_check_password.pl | 6 +-
C4/SIP/interactive_patron_dump.pl | 4 +-
C4/SIP/interactive_renew_all_dump.pl | 4 +-
C4/SIP/t/000_sc_config_auth.t | 4 +-
C4/SIP/t/00sc_status.t | 2 +
C4/SIP/t/01patron_status.t | 6 +-
C4/SIP/t/02patron_info.t | 4 +-
C4/SIP/t/03checkout.t | 4 +-
C4/SIP/t/04patron_status.t | 4 +-
C4/SIP/t/05block_patron.t | 6 +-
C4/SIP/t/06patron_enable.t | 4 +-
C4/SIP/t/07hold.t | 4 +-
C4/SIP/t/08checkin.t | 4 +-
C4/SIP/t/09renew.t | 4 +-
C4/SIP/t/10renew_all.t | 4 +-
C4/SIP/t/11item_info.t | 4 +-
C4/SIP/t/SIPtest.pm | 6 +-
C4/SIP/xmlparse.pl | 2 +-
acqui/basketgroup.pl | 37 ++--------
admin/aqbudgets.pl | 6 ++
cataloguing/addbooks.pl | 3 -
debian/scripts/koha-start-sip | 2 +-
installer/data/mysql/updatedatabase.pl | 22 ++++++
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 11 ++-
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 2 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +-
.../bootstrap/en/modules/opac-topissues.tt | 2 +-
t/00-load.t | 3 +-
t/SIP_Sip.t | 18 ++---
t/db_dependent/Acquisition/Invoices.t | 9 ++-
t/db_dependent/Suggestions.t | 34 +++++++++
56 files changed, 297 insertions(+), 221 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list