[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.12-60-g7a2cd9d
Git repo owner
gitmaster at git.koha-community.org
Fri Dec 11 04:19:53 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, 3.18.x has been updated
via 7a2cd9dcc4097dbf57bb4f128dbaa5e6d892d32c (commit)
via e5b4d4e894037581e60408786c00002f8d62c7f4 (commit)
via fe792c6bce62892e66d54bbd80ef82babfbd27e6 (commit)
via 84fa5ba37a81828079cff363cfc364979e0ad005 (commit)
via cb3dec9af9da640f3e32996797cae64dbc531bab (commit)
via f39504ec0293e681d47ffd9b438decd3a1014ba3 (commit)
via b61d1c461bdaa22af48005e0d7a39c5d08ee0a3b (commit)
via 14f3736051a0cc50b6b667a85bd20125e9e0bdd3 (commit)
via 3399e3d4b8429393aefd9552ef8c74388f073b6b (commit)
via bf9994fb34aa01bf9a635358f4adb64b8a7b26c4 (commit)
via 6edc09cfef26158266979479de0c7e83566ccd64 (commit)
via 5c9534a6ad5d0109b8876dda08c07294814c54ad (commit)
via e8fcc11d46b053a90a0ea119c0f255017294e2af (commit)
via a8d67f57c437b5a62c7eb5a2a985088af6be16fb (commit)
via 08b4eb1b4f4dfa152c593d94b797f142206fc27c (commit)
via b4aa4fcb2c43a45b0b35a62bf9ed40c8bd03d65b (commit)
via 28834f0e9ab2220e5576b3497df23d66f7ceaca9 (commit)
via bc20806f187e6b21b51fa11658fdf8da91ff3a55 (commit)
via 3ae124e6af22472586258e10688dce8b26827442 (commit)
via d7c768e98b76d8a33d56a3fdc249681dbf096026 (commit)
via 1f0e4471d268d08bc9cb67508cd7a37581fb4865 (commit)
via 781ccb9eaf82bf065d4e14b7f1eec890335be9dc (commit)
via ec421d6c321b741db53551efdc9f4ef61ef0b969 (commit)
via 786f21a8c10b81fbfd4710e00f4568b2f53ce872 (commit)
via e7afb75fe4999382387c237fe409d7be6beb5595 (commit)
via b1a26201782577f913824ea045eccf1e039cba25 (commit)
via a7f91406ede430c22efca73a7016f2ceb819d480 (commit)
via 0a27e3517fb1da3c460f887b71f49bad85e1e7b6 (commit)
via df64a9ca8a9574463fd6ef5e170ce14eeacfee00 (commit)
via b46754d842bc6a03ca3051307e4f32f0892b733f (commit)
via c11723f28aa32f24255c3c882ecfbbaa5f3dbe98 (commit)
via 7e15f61a69df9d2f762b065295c9f2451bd96f8e (commit)
via b958af6f1213ded4f49216405d4c67a78394673d (commit)
via b10ccd466592250f2b40f182e9d5e1db91d1dcab (commit)
via 37ca7f59fc7ab863cffff15b06d4b0d29844245a (commit)
via 839f8312a27d904b4295cb801b3480298a9a897c (commit)
via 9aa9a8ef3770a6a6845f37b90bbbdd8feada9c93 (commit)
via 3c27f9c8c63122801770d794b4f5ebe7dbfd7353 (commit)
via ede5e7c6884295e0dbe77618a03cd4a8cef723c6 (commit)
via 9bcc69167c1f4fdb43119569f81ca912ce788ec9 (commit)
via ed24d7a8d7252096f3a5a0667d9748c66451bd74 (commit)
via 1ae8785540a56c41a7f53bb9c04deb442bd98c74 (commit)
via 6d01b9fcbdf10b8163edb36af3465e91dcab9a7a (commit)
via c61e33e6f0962026c32a9be80b05cb20ab17d7b7 (commit)
via 744da173721dfe8a7bcd0e211a8f0d253e6aeb0e (commit)
via 8e4c2bb2c7df66c13f11a408bed32da8fc1fc6dd (commit)
via 1fe5ce9aa001ad57265adb7f76080cbe8ae5edd8 (commit)
via 477da3c192ac65581a5e1f810789ced86cce5146 (commit)
via ce5b361fc81938695b3a7271f803d1322d93b63b (commit)
via 4bf09f1c515ae78b8623b23a10118c156896dc00 (commit)
via c543002df14deca891ca740e129c5e93bdca269f (commit)
via eda3170f22804233ca2a3678dd5e64858c2c1358 (commit)
via 1a319d293c1da08f71e32a447e8c41f7ac5a25bd (commit)
from ba048481d80f36f6436619d64a3cd9ffdbaa2924 (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 7a2cd9dcc4097dbf57bb4f128dbaa5e6d892d32c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 25 16:40:37 2015 +0000
Bug 12152: Holds to pull report - Display location descriptions
...instead of their code
Test plan:
Same as before, confirm the the location codes are replaced with their
descriptions.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit a901ed155a56a2c4ab95bb7bc951e2a0a7d04277)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 0ee6451023ca0c973052bcf685e9ab329a390927)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 217c50382a436cecd159a63eb1f93f4802214a46)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e5b4d4e894037581e60408786c00002f8d62c7f4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Nov 22 03:38:30 2015 +0100
Bug 12152: Holds to pull report - Show branch names and item type descriptions
The 'Holds to pull' report shows branch and itemtype codes without
this patch. With the patch, names and descriptions should display.
To test:
- Make sure there are some holds for available items in your system
- Go to Circulation > Holds to pull
- Verify changes mentioned above in the list of holds shown
Signed-off-by: David Cook <dcook at prosentient.com.au>
Works as described, although as Magnus mentioned, Locations
still use codes instead of descriptions.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 0f7f6a5cb32cd2e68bc39e8464147852347be310)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit 773d7e2d1faa449ea1bd6f28d2422a195388686e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 7e577fe266d2f775e15cdaed60951ca6de86ad2f)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit fe792c6bce62892e66d54bbd80ef82babfbd27e6
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Nov 25 18:18:04 2015 +0100
Bug 15250: Fix Perl error on acqisition stats page
To test:
- Go to reports -> Acquisitions statistics
- Populate with the following values:
Acquisitions statistics
Received on.
Row: checked
Column: checked
From: 01/01/2015
To: Un-selected
Cell value
Count items
Output: To screen into the browser: checked
- Running the report will trigger the following error:
Software error:
Can't locate object method "field" via package "aqorders.datereceived" (perhaps you forgot to load "aqorders.datereceived"?) at /usr/share/koha/intranet/cgi-bin/reports/acquisitions_stats.pl line 293.
- Apply the patch and repeat test
- Verify the report now works correctly
Note: Patch was created from notes and suggested
fix on the bug report, written by Barton Chittenden.
Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
(cherry picked from commit d9cef35b75770104494c2f4a01d975f367b515bf)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit cd693a52b8306f1bdc66804fb84fe17cadcd658f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit d52ae9be236ec1355991b060afef0d50b500164f)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 84fa5ba37a81828079cff363cfc364979e0ad005
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 25 17:08:43 2015 +0000
Bug 15256: Fix items table display on the detail page
Bug 14966 fixed a bug but introduced another one: With
IndependentBranches set to 'prevent', if the librarian (without the
superlibrarian permission) can edit items but not all, the table is
broken. DataTables raises the following warning: "DataTables warning:
table id=DataTables_Table_1 - Requested unknown parameter '8' for row0."
And does not display correctly.
Test plan:
1/ Create a biblio record with 1+ items located in different places.
2/ Create/use a patron with the permission to edit items
3/ Set the IndependentBranches pref to 'prevent'
4/ With this patron logged in, go on the record detail page.
Without this patch, the display is broken (only 1 edit link and 1 td
missing, DataTables raises a warning).
With this patch, the display is correct.
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
See the warning, and the broken table. Solved by this patch.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d456acc7bfd2507ac7eaaf32bd6da1f023655886)
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
(cherry picked from commit ed13f4fe200352460b62376b01ba48d3ba51ae80)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit a6d5c091df0b15e00719d5a14f42ac7fd4f61e5b)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit cb3dec9af9da640f3e32996797cae64dbc531bab
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sat Dec 5 01:26:11 2015 +0000
new Debian package maintainer
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
(cherry picked from commit 3ee174b759630752dec9c53066fa79ef056e180c)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit f39504ec0293e681d47ffd9b438decd3a1014ba3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Oct 1 11:58:41 2015 +0100
Bug 5371: (follow-up) Force no caching for private pages at the OPAC
Same as previous patch for opac-messaging.pl and opac-readingrecord.pl
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit a988e9425ce1f8f4bf28b46473adac941d634973)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c5c954506f5400b8732ee37c52d86c009215ec8f)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b61d1c461bdaa22af48005e0d7a39c5d08ee0a3b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 12:45:15 2015 +0100
Bug 5371: Force no caching for private pages at the OPAC
In order no to slow too much the browsing, it is certainly not a good
idea to add this cache-control value for all pages at the OPAC.
This patch just adds where the author found it could be useful.
Test plan:
1/ Login at the OPAC
2/ Go on the account page (opac/opac-account.pl)
3/ Click log out
4/ Use the back button of your browser
Without this patch you will see the previous page.
With this patch, the previous page will be reloaded and you will be
redirected to the login form.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
(cherry picked from commit 542ab0bce949eba3abc98ff1c433fe6099db105d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Conflicts:
opac/opac-discharge.pl
commit 14f3736051a0cc50b6b667a85bd20125e9e0bdd3
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Nov 17 17:18:05 2015 +1100
Bug 15198: Change wording of OpacSuppression system preference
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Paragraph rewording successfully
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 30a0365e915cce4e9b08bde790db69ef6d8ce9bd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 2f5b29ef19d85c40ed386be3fb4490387471d35c)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3399e3d4b8429393aefd9552ef8c74388f073b6b
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Nov 17 13:03:59 2015 +1100
Bug 15198: Make OpacSuppression work even if there are no records suppressed
This patch adds the Zebra special attribute 14 to ccl.properties and
opac-search.pl, so that we can turn on OpacSuppression and still return
results even if there are no records in Zebra for the Suppress index.
_TEST PLAN_
Before applying:
1) Make sure that you have no suppressed records indexed in Zebra
2) Turn on OpacSuppression system preference
3) Search using a keyword which should bring up records
4) Note that no records are returned in the results
5) Change UseQueryParser system preference to "Try"
6) Repeat steps 3-4
Apply the patch.
After applying:
7) Repeat step 3 (ie search using a keyword which should bring up records)
8) Confirm that records are appearing in the results!
9) Change UseQueryParser system preference to "Do not try"
10) Repeat step 3
11) Confirm that records are appearing in the results!
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. No more, won't need to have at least one record with the
value "1" in the field mapped with this index. All records in OPAC returned.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit dd9a4ed6c6fbc078d43880e4adf8cfe28179888d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c0928321a062fed31ce4ca841237be36d3e14cc2)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit bf9994fb34aa01bf9a635358f4adb64b8a7b26c4
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Sun May 24 17:52:25 2015 +0200
Bug 14264: Fix export of late orders when translated
Bug 7298 tried to fix this issue, but it was not correct.
We have 3 files in acqui/csv:
basketgroup.tt, basket.tt and lateorders.tt
The first 2 don't contain translatable string, and are not modified on
translating the templates (`translate install`)
On the contrary, lateorders.tt has some strings to translate ('Author:',
'Published by:', etc.). After being translated, all carriage returns
between TT tags are removed.
Test plan:
1/ choose a language and update + translate the templates
for instance:
cd misc/translate;
./translate update es-ES; ./translate install es-ES
2/ Go to acqui/lateorders.pl using this language
3/ Generate a csv for 1+ late orders and confirm the first line only
contains the headers.
Signed-off-by: Laurence Lefaucheur <laurence.lefaucheur at biblibre.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit b2706884a1916827229ad6f818790ec47a43cbf5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 9fa3b18924addd2c468435b13bc1fc84157fff28)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6edc09cfef26158266979479de0c7e83566ccd64
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 12:11:34 2015 +0100
Bug 4502: Changing wording again...
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Just a string patch, others are signed.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 379329861d19b178f14d360d9fee2518a462d8a7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 9d691b2a85d494b66352d2d3de05480fe170fd89)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 5c9534a6ad5d0109b8876dda08c07294814c54ad
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Apr 6 19:50:30 2015 -0400
Bug 4502: An attempt to make things more sensible.
The reason the budget_period_id was not defined was because in
two cases it was not passed! This patch adds those missing
parameters. And as a result, cuts out the attempt to default the
authcat to '' unless the budget_period_id is defined.
Additionally, the start and end months don't seem to be passed,
so rather than have it blow up, checking them forces the else
case logic.
budget_period_id is the budget id. If you have two budgets,
you can craft a URL to work with budget_period_id matching
those two ids. Anything else should trigger the new error which
was modified to reflect more of what the problem is.
Follow the test plan in comment #6. Feel free to also to attempt
crafting URLs and triggering errors.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Well, works and does not explode any more
No errors
To trigger the new message simply put /cgi-bin/koha/admin/aqplan.pl
on your staff page, an intriguing 'Planning for by Asort1' appears :)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit fea7b9b4d444a6bdf3f1326c54eddd68670be7f7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 4ca1bac3106728450cef9feb9df942e78a1256a9)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e8fcc11d46b053a90a0ea119c0f255017294e2af
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Mar 24 15:54:37 2015 +0100
Bug 4502: Catch software error if no active budget defined
TEST PLAN
---------
0) Back up your database.
1) In mysql client:
> DROP DATABASE {your koha database name};
> CREATE DATABASE {your koha database name};
> QUIT;
2) Go to the staff client, and install all the default
and optional things -- except patrons. :)
3) Log into staff client.
4) Create a patron -> New Patron -> Staff
5) Enter data and Save
6) More -> Set Permissions
7) Make superlibrarian
8) Log out
9) Log in as new superlibrarian
10) Acquisitions -> Budgets -> New Budget
11) Enter a non-active budget with some funds.
-- Once saved, it should list in the inactive budgets.
12) Click on the name.
13) Click on one of the Planning submenu options.
14) Click the 'Submit' button in the Filter area.
-- This should trigger the blow up.
15) Apply the patch
16) Repeat steps 12-15
-- The kaboom is avoided and a nice message given.
NOTE: This does not solve all the problems in this ugly, ugly
module area. It does solve the one thing it is meant to:
that nasty kaboom.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 0a391237710aec779b000c3dff219e54b22fb76a)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit e5d59cad73a4b6c16aca72bf478ce8df4e5f8f3e)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a8d67f57c437b5a62c7eb5a2a985088af6be16fb
Author: Liz Rea <wizzyrea at gmail.com>
Date: Fri Dec 11 14:35:58 2015 +1300
3.18 rmaint followup: fixing forbidden pattern in C4/SIP/ILS.pm
commit 08b4eb1b4f4dfa152c593d94b797f142206fc27c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Mar 2 06:06:58 2015 -0800
Bug 13411: (QA followup) Add logging
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit feafa273e443e56021959153e91bd999a68daf29)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit fc5804e6f1c175e40708b0a7604c4bf7ba5344bd)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b4aa4fcb2c43a45b0b35a62bf9ed40c8bd03d65b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Aug 27 10:56:22 2015 -0400
Bug 13411: Koha's SIP server returns not ok for checking in items that are not checked out
If an item is not checked out when a checkin via SIP2 is attempted,
Koha's SIP server sends back an "ok" of 0, and the AF message "Item
not checked out". I am not entirely sure this is good and correct
behavior by the SIP2 protocol.
In particular, this will cause SIP2 book sorting devices to fail on
all items that are not checked out, causing them all to be put into
the "special handling" been that should be reserved for things like
items checked in at the wrong library and items on hold.
Test Plan:
1) Apply the patch for bug 13159 so you can use the new enhanced
SIP2 command line emulator
2) Use a command similar to the following to check in an item:
sip_cli_emulator.pl -a localhost -su <sip user> -sp <sip password> -l <instituation id> --item <barcode> -m checkin
3) Note the 3rd character is 0, and there is an AF field saying the item is not checked out
4) Apply this patch
5) Restart the SIP server
6) Repeat steps 2-3, note that nothing has changed
7) In the SIP config file, Add the parameter checked_in_ok="1" to the SIP account you are using.
8) Restart the SIP server
9) Repeat steps 2-3, note that this time the 3rd character is 1, and you do not recieve the item not checked out message.
Signed-off-by: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Signed-off-by: Brendan A Gallagher <brendan at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 181d3aa56de8377c67247db26932c4e5a7cb83d9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c87520d90a99c06a7f6194643ead55c1ebd3a867)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 28834f0e9ab2220e5576b3497df23d66f7ceaca9
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed Nov 11 18:59:35 2015 +0100
Bug 15175: Respect IntranetBiblioDefaultView syspref
Respect IntranetBiblioDefaultView on intra search result page, on cover image
link, when XSLTResultsDisplay is empty.
TO TEST:
1. Empty XSLTResultsDisplay
2. Activate intranet local and Amazon cover images
3. Play changing IntranetBiblioDefault, and observe the links respectively on
biblio record title and cover image. Title's link is OK, cover image
link goes to detail.pl page independently of IntranetBiblioDefault.
4. Apply the patch.
5. Repeat 3.
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Link to right display according with IntranetBiblioDefaultView is fixed.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
http://bugs.koha-community.org/show_bug.cgi?id=14175
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 0fe08231f427bdc65b1ff1219ad7507c284f1dbd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c9d030f75f338fea183895010e8787ae1fe48c67)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit bc20806f187e6b21b51fa11658fdf8da91ff3a55
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 13 15:45:04 2015 +0000
Bug 15114: Fix typo in opac-suggestion template
There is a $ in front of the loggedinusername variable, which is
obviously not what is expected here.
It fixes the wrong warning message "You are not authorized to see
pending purchase suggestions." when it should be "There are no pending
purchase suggestions."
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 621f2ce9ac960d93466c9da5b4c6559e71519e3d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c262b16abec3d23eea864eed91dd132685ff6285)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3ae124e6af22472586258e10688dce8b26827442
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 13 09:17:49 2015 +0000
Bug 15109 - Regression in patron search results ordering
In Koha 3.16 or earlier, before the introduction of the ajax datatable
for patron searching, the search results were ordered by name. In
master, the results are currently ordered by cardnumber, which is not
very useful.
Test Plan:
1) Do a "browse by last name" or a patron search
2) Note the results are sorted by card number
3) Apply this patch
4) Reload the page, start a new search
5) Note the results are sorted by name
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit cc65a5fed2afd27b2a45af49d6fe08d54fef7de9)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 1524cb1119db421bd67a22e461cb53bdadd75ec7)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit d7c768e98b76d8a33d56a3fdc249681dbf096026
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Nov 17 12:36:16 2015 +1100
Bug 15182: Conditionally load Koha::NorwegianPatronDB
This patch loads Koha::NorwegianPatronDB if it can, or adds a warning
to the log if it can't load it.
Since the Koha::NorwegianPatronDB functionality in C4::Members is
wrapped in system preferences, the loading of the module is
irrelevant unless one actually wants to use the module and its
associated functionality.
NOTE:
This patch fixes a problem where we were getting errors saying
Crypt::GCrypt couldn't be loaded even though it's not a required
dependency.
This patch will likely only affect people not using Debian-based
systems where libcrypt-gcrypt-perl is available. The current
version of Crypt::GCrypt doesn't build so it's not an option
for most non-Debian users to install this not required
dependency in order to work around this issue...
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised for Debian-based systems
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 1801a9462e190231f3303b01247b834f6e1d99bd)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 3b510cee00e5960eff43800d9df978123061b9b6)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 1f0e4471d268d08bc9cb67508cd7a37581fb4865
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Thu Nov 5 08:45:25 2015 +0100
Bug 15133: encode correctly email generated by runreport.pl
/misc/cronjobs/runreport.pl send badly encoded email in text/csv
(partially ok in HTML).
TEST:
1. Send by email a report containing a subject with accented characters
and resultset with accented characters. For example:
./runreport.pl --subject="éèà" --to=me at home.org 1
./runreport.pl --format=html --subject="éèà" --to=me at home.org 1
The first email contains badly encoded subject & message. The second email
contains badly encoded subject, but correct message.
2. Apply the patch
3. Repeat 1 => No more strange characters.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Characters are correctly encoded now, thanks for that good spot.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 9515db57bdd13cdff33d9056963455fb850ad877)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit bfbddd183c9c97b05b1e9305ff5e8f45ac19c179)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 781ccb9eaf82bf065d4e14b7f1eec890335be9dc
Author: Liz Rea <liz at catalyst.net.nz>
Date: Wed Nov 4 15:33:40 2015 +1300
Bug 15120: runreport.pl cronjob doesn't allow custom subjects anymore
To test, well do something like
misc/cronjobs/runreport.pl --subject="My fancy subject!" --to=you at youraddress.com 1
where 1 is the number of your favourite saved report.
Success is your email arrives with the subject "My fancy subject!" Failure is
(with --subject defined) you get either the description of the report, or "Koha
saved report" as the subject. This is success without --subject defined.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Bug repeatable and fixed by this patch.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 4f8476e09c2de223f73692521b8f8e533ef8400f)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 5288b0d9b579a90e287348c8650d9d92a36f8ca2)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ec421d6c321b741db53551efdc9f4ef61ef0b969
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Thu Jul 16 17:48:14 2015 +0200
Bug 14542: Transliterate rule for all single quote forms
Single quotes in common language (not in programming) are usually ', but
there is also the form known as ’ in HTML. See
https://fr.wikipedia.org/wiki/Apostrophe_%28typographie%29
This bug proposes to transliterate all forms into a space.
Test plan :
(I'll use the code ’ instead of the unicode character)
- Without the patch
- Create a record with title : L’avion d’argile
- Index this record
- Search for "L’avion d’argile" => You find the record
- Search for "L'avion d'argile" => You do not find the record
- Apply patch
- Search for "L’avion d’argile" => You find the record
- Search for "L'avion d'argile" => You find the record
- Search for "L avion d argile" => You find the record
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit b11eb03a4c9674f4f4dedadaa8790257e30fb1d0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c7f90a22be27a8960b6429a5a7e66bf77371f8da)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 786f21a8c10b81fbfd4710e00f4568b2f53ce872
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Apr 29 12:35:00 2015 +0200
Bug 14078: (followup) converting from ISO5426 is not complete
Conversion of MARC from ISO5426 is defined in C4::Charset::char_decode5426().
Each character or combined characters conversion is defined in a map.
This patch adds missing conversions.
See http://www.gymel.com/charsets/MAB2.html
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 636050f9be374fc15acad8b047c1ae227d38b225)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 27d0b204889dacc8cb4ad472a853b7f642b4b0ea)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit e7afb75fe4999382387c237fe409d7be6beb5595
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Wed Apr 29 12:24:23 2015 +0200
Bug 14078: converting from ISO5426 is not complete
Conversion of MARC from ISO5426 is defined in C4::Charset::char_decode5426().
Each character or combined characters conversion is defined in a map.
This patch changes some odd actual conversions.
In char_decode5426(), only characters between 0xC0 and 0xDF will be used for combining with following charater :
($char >= 0xC0 && $char <= 0xDF)
So conversion like "$chars{0x81d1}=0x00b0" will never be used.
Rules for "h with breve below" use combining with 0xf9 but looks like the correct caracter is 0xd5.
See http://www.gymel.com/charsets/MAB2.html
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 5e3882bcecede59f24a6b3c4aa9c4324390a29c3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 2ceab7145e2c337a8737d2f3a4b20ff9a6c20315)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b1a26201782577f913824ea045eccf1e039cba25
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date: Sat Nov 7 00:16:02 2015 -0600
Bug 15154: Allow correct translation for upload local cover image
To test:
-Set syspref LocalCoverImages and OPACLocalCoverImages to Allow
-A new tab 'Images' appear in bib record detail on Intranet.
-Notice about the phrase "Please upload one"
-Apply the patch and reload the page.
-New phrase appear "Select the image file to upload" with button Upload
-Update translation files : cd misc/translator; perl translate update es-ES
-You will see in es-ES-staff-prog.po the new entry
"Select the image file to upload. %sUpload%s"
-You can see the result installing the translation
cd misc/translator ; perl translate install es-ES
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
A native English speaker could confirm that the wording is ok: Please select
the image file to upload
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit dfa757af927aaa5b80a4dd8c90210d12531cfcd7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit ffa12f38437792b927e7189ec9fbe3f3429065a9)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit a7f91406ede430c22efca73a7016f2ceb819d480
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Nov 13 15:18:56 2015 +0000
Bug 15137: Display ISBN and author info when sending list by email
Disclaimer: this is not caused by bug 14544 :)
And can be backported!
Both isbn and author information are missing when a list is sent by
email.
Emails sent from OPAC and staff should be (almost) the same.
Test plan:
1/ Sent a list by email (Button "Send list")
2/ The email you will receive should contain the isbn and author info
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
On top of last patch of Bug 14544
Works ok, mail with authors and ISBN
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit eb286ebbc3c594e8e81e1e8b1848ca1d52b8bccb)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit caf0e23032c0ced4bba07ab4d888bd74695c9110)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 0a27e3517fb1da3c460f887b71f49bad85e1e7b6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Sep 17 14:31:55 2015 +0100
Bug 6657: Prevent biblionumber to be duplicated
If the biblionumber field is displayed in the framework, on editing a
biblio the field/subfield will be duplicated.
To prevent that this patch adds a check when building the field list.
Test plan:
1/ map biblio.biblionumber with 999$c
2/ Display 999$c in a framework
3/ Edit a biblio using this framework
4/ Save => The field should not have been duplicated
5/ map biblio.biblionumber with 001
6/ Display 001 in a framework
7/ Edit a biblio using this framework
8/ Save => The field should not have been duplicated
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works as described, aldo removes duplicate values.
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 9ae556a21243ecae669bda2c5f42a67769ae9d78)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit c32edbd6e1d25583b8bf040e472727b0058a87d6)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit df64a9ca8a9574463fd6ef5e170ce14eeacfee00
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 29 07:48:02 2015 -0400
Bug 15079: Batch Delete Records Error
When using the batch deletion tool, if the script attempts to delete an
undeletable item, the script will die with the error:
Label not found for "next BIBLIONUMBER" at
/usr/share/koha/intranet/cgi-bin/tools/batch_delete_records.pl line 172.
Test Plan:
1) Attempt to batch delete a record with an item that cannot be deleted
2) Note error
3) Apply this patch
4) Repeat step 1
5) Note the error no longer occurs
Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
Works as advertised. Follow comment 5 to reproduce the issue
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
I have not tested this patch, but looking at the code it is obviously a mistake.
If an error occured, we rollback and skip this record.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 706a31b50d52ef1ba48c568d7e60c376cfe87983)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit dc39e4b410c173d497ce41651dbf39d6a72dd461)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b46754d842bc6a03ca3051307e4f32f0892b733f
Author: Aleisha <aleishaamohia at hotmail.com>
Date: Tue Jul 21 18:38:58 2015 +0000
Bug 14553: Silencing warn triggered when clearing item rating on OPAC
To test:
1) Go to any item and clear the star rating (don't have to set a rating first)
2) Notice the warn
3) Apply patch and reload page
4) Clear star rating
5) Notice no warn
6) Click a star to add a rating
7) Make sure your rating, the average rating and amount of votes are all
correct
8) Could be beneficial to log in as another user and try to add a rating on the
same item from their account. Check the average rating is
cacalculated and amount of votes increases
9) Confirm still no warns
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Can see the warning in logs, and its disappearance with this patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 94c5f8d5f06b588da0903c9607349adbf16344be)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 0a325ab7ba740b69819d89bb1d6de18015289cae)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit c11723f28aa32f24255c3c882ecfbbaa5f3dbe98
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 10 15:17:12 2015 +0000
Bug 14735: Save cache_expiry on modifying a report
The cache_expiry is not saved when updating a SQL report.
Test plan:
0/ Enable memcached
1/ Create a sql report
2/ Edit it and change the cache expiry value
3/ Edit again
=> The value should have been updated.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Repeatable bug. Solved with this patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 27a15d5a429620dbad0a16292d714e3389ea057e)
(cherry picked from commit eeb9a6c1e577245387604987a5ed1cd5c1ab1411)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 7e15f61a69df9d2f762b065295c9f2451bd96f8e
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Nov 10 09:06:32 2015 +0000
Bug 14575: Fix typo in opac-basket.tt
No more typo in the codebase.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit a0460ecc0abbe5f69554ab3885775e55b6a25fe0)
(cherry picked from commit da2dfc07e3391492ae218389467d2959d92cec3e)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b958af6f1213ded4f49216405d4c67a78394673d
Author: David Cook <dcook at prosentient.com.au>
Date: Tue Jul 21 13:09:39 2015 +1000
Bug 14575: OPACURLOpenInNewWindow should apply to item-level urls too
This patch applies the OPACURLOpenInNewWindow system preference
to item-level urls (in addition to the pre-existing bib-level url
handling).
_TEST PLAN_
Before applying:
1) Set OPACURLOpenInNewWindow to "don't" and click on an item-level url
2) Note that the current tab changes to that url
3) Set OPACURLOpenInNewWindow to "do" and click on an item-level url
4) Note that the current tab changes to that url
Apply the patch.
After applying:
5) Click on an item-level url
6) Note that the url opens in a new tab (as OPACURLOpenInNewWindow
should be set to "do")
7) Set OPACURLOpenInNewWindow to "don't" and click on an item-level
url
8) Note that the url opens in the current tab
9) Repeat the above steps 5-8 alternating
"TrackClicks" between "Don't track" and either "Track" or
"Track anonymously".
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit e815d1e010a20b73327cba1eaa78d08f06ec50a8)
(cherry picked from commit 219df070e8beaede19914e995e7eb60be37ae854)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit b10ccd466592250f2b40f182e9d5e1db91d1dcab
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Oct 20 14:19:35 2015 +0100
Bug 15036: Do not overwrite complete status in basket ops
Reopening or closing a basket should preserve the completed
status for receipted orders.
This patch excludes orderlines with the completed status
from having their status rewritten as a result of the
change in basket status
Made the subroutines involved more efficient by removing an
unnecessary loop and by not fetching a large amount of
superfluous data
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 4a4dbbf1237c93e0233eef0600015c9be3320bf0)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 9dace4e21e33f1b92e1e2db7ef72435539895794)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 37ca7f59fc7ab863cffff15b06d4b0d29844245a
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Tue Sep 22 09:49:39 2015 +0200
Bug 14867: userid not generated when defined in BorrowerUnwantedField
When userid is not provided when creating a new patron, it is generated
using surname and firstname. The bug is when userid is defined in
syspref BorrowerUnwantedField, the input text is missing in patron
creation form. When saving you always get an alert message :
"Username/password already exists". No patron can be created.
This patch corrects by adding this case to userid generation conditions.
Test plan :
- add 'userid' in syspref BorrowerUnwantedField
- try to create a new patron : /cgi-bin/koha/members/memberentry.pl
- there is not input text for userid
- choose non-existing surname and firstname
- click on save
=> Without patch : patron is not created, you see the alert message
"Username/password already exists"
=> With patch : patron is created, userid is generated with surname
and firstname
- remove 'userid' in syspref BorrowerUnwantedField and check it can be
defined in patron creation form
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
The issue is there, and this patch fixes it.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 0cbc65111c735e699d94d50ad09c17fb7b7b8913)
(cherry picked from commit ee185cfd1afed08d20f226ef8a2c62df2c96b6e8)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 839f8312a27d904b4295cb801b3480298a9a897c
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Thu Jul 2 16:42:16 2015 +0100
Bug 14388: Funds should be sorted by budget_code
Before this patch, the funds were sorted by budget_id, which does not
make any sense.
This patch adds a sort by budget_code on the fund list (acqui/acqui-home.pl and
admin/aqbudgets.pl)
Test plan:
On both pages (acqui/acqui-home.pl and admin/aqbudgets.pl) confirm that
the funds are now sorted by fund code (DB column budget_code)
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit e0032c46e98b4cf31d76abb93d12041ea362d81e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 1cd654313bd539e22eacf4322fc419331ed80d44)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 9aa9a8ef3770a6a6845f37b90bbbdd8feada9c93
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date: Mon Aug 17 12:40:05 2015 +0000
Bug 14687: Patron's transaction history changes items' order after paying fines.
Sorts Patron's accounting data consistently from newest to oldest.
It doesn't depend on anymore to timestamp (which can be same for multiple
entries) from database but instead uses accountline's id to sort.
Signed-off-by: Liz Rea <liz at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 307fe0ac533c2dc8116a183d104c864717a91fc5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit eea56d412461d9b673306697dcf5335d8686afc8)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 3c27f9c8c63122801770d794b4f5ebe7dbfd7353
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Sep 22 11:16:28 2015 +0100
Bug 12540: Display "Every" on editing a MMT action if previously selected
On creating a marc modification template action, the "All" is changed with
"Every" if the condition field is the same as the original field.
But on editing, the "All" value is not replaced. For consistency, it
should.
Test plan:
1/ Create the following action:
Copy field 650$x to 650$y if 650$z matches "foobar"
Note that the "All" is replaced with "Every" when the condition is the
same field as the original field.
2/ Save
3/ Edit the action.
The "Every" should be selected.
Without this patch, "All" is selected.
Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 384dceeef583c444ac8350c928a2e1aed34e536b)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 868bdc355d9f5d7e098fd00eff2fbc29597659c7)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ede5e7c6884295e0dbe77618a03cd4a8cef723c6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Nov 6 11:21:56 2015 -0300
Bug 15151: Avoid DB access to load C4::Members
In order to avoid loading Koha::NorwegianPatronDB a DB query was
used. Instead, a require should be used. This causes non-db_dependent
tests that load C4::Members to fail.
To test:
- Shut mysql down
$ sudo service mysql stop
- Run the tests:
prove t/Circulation_barcodedecode.t
=> FAIL: DB connection is expected, tests fail
- Apply the patch
- Run the tests:
prove t/Circulation_barcodedecode.t
=> SUCCESS: Tests pass
- Sign off .-D
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
cherry-picked from f25fe6ddb4a340f12613784dc841ab5bfd672d6b
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit bc668dccd3af3fba14e04a764499b0d762c63455)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 9bcc69167c1f4fdb43119569f81ca912ce788ec9
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Sep 16 13:56:23 2015 +1200
Bug 15035: Anti-spam for opac-suggestions - FOLLOW-UP
to test this patch...
1/ enable 'suggestion' and 'AnonSuggestions' sysprefs
2/ edit the koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt file,
to reveal the hidden 'negcap' field
replace line 87 opac-suggestions.tt, from...
<li id="negcap" style="position: absolute; left: -2000px;">
to ...
<li id="negcap">
3/ attempt to add another suggestion, and populate the 'negcap' field
adding the suggestion is supposed to fail, but actually succeeds!? :/
4/ apply patch
5/ repeat step 3, suggestion attempt should fail as expected
modified: opac-suggestions.pl
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Confirmed insertion with negcap before patch.
With negcap value suggestion fails silently
Without negcap suggestion is inserted
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 6b31947c3bb6517ecdc7d21440ba79895c270749)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 49d2b2c84dbd85da2a2495ac3b81e450f4e522b4)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ed24d7a8d7252096f3a5a0667d9748c66451bd74
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Wed Nov 4 17:06:10 2015 +0100
Bug 15130: useless unitialization warnings when updating authorities
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Fixes a trivial coding error.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 6c94dc79878c727b47f0617548613e1b7f5794a3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 34ae0f50aedc693091d462a000fe93bc02b63e82)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 1ae8785540a56c41a7f53bb9c04deb442bd98c74
Author: Indranil Das Gupta <indradg at gmail.com>
Date: Mon Aug 3 09:57:53 2015 +0530
Bug 14632: Fix alert message for single item batch
Fixes the incorrect msg "Please select at least label to delete."
for attempts to delete from single patron batches. Notifies the
user that doing so will delete the batch. It disallows direct
deletion, instead suggests the users to use the 'Delete batch'
option assuming the users know what they are doing.
Test plan
=========
1/ Load a single patron batch in edit mode and attempt to delete
the single record. The JS alert message will inform that "Please
select at least label to delete."
2/ Apply patch and refresh page and try to delete the single record
again.
3/ This time the alert will inform the user that doing so will delete
the batch and should that be desired action to choose the 'Delete
batch' option from the toolbar.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
It works as before but with an understantable warning message.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 85ae12e5864d8fd35f42a53c66440f00f7f4a35d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit a698cd39dba4595b9094c097db8d4108d11f1a4f)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 6d01b9fcbdf10b8163edb36af3465e91dcab9a7a
Author: Marc Véron <veron at veron.ch>
Date: Wed Nov 4 10:13:46 2015 +0100
Bug 15117: Transfer Order: Better user information and translation handling
While transferring an order, a untranslatable JavaScript confirmation
dialog pops up.
This patch moves the information about the order to be transferred to the
top of the screen to better inform the user what order is to be transferred,
and simplifies the confirmation dialog.
To test:
- Apply patch
- Transfer an order from a basket to another basket
- Verify, that on top of the screen an information is displayed about which
order from which vendor and basket is to be transferred
- Verify that the transfer works OK
- Update a po lang file and confirm you see the string and you are able
to translate it.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Dialog box with readable & translatable info.
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 571ec9a94b9323cd23f9012d9b1f837fd9bf974c)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 57a8479bf36f530a55fd93ba67fe965efb0e0373)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit c61e33e6f0962026c32a9be80b05cb20ab17d7b7
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Aug 11 16:51:53 2015 +0100
Bug 14673: Work around change to AddIssue return
Return from AddIssue used to be due date or undef.
Now it is less straightforward returning am issue object
if an issue row is created or undef. If the issue is a renewal
undef is returned. As that case was not handled properly it
caused the server site to crash the listener causing a
communications error on the client.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit b4967bf0ed60c5cca0c7f60591d21d2919f477a1)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 374f5f4a38883d351d441412cfdf4785bbe7f4b6)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 744da173721dfe8a7bcd0e211a8f0d253e6aeb0e
Author: Marc Véron <veron at veron.ch>
Date: Fri Sep 4 09:50:07 2015 +0200
Bug 14781: Creation of barcode types 2of5 not functional
This patch fixes the rendering of "COOP2of5" or "Industrial2of5" barcodes in the label creator module.
To test:
- Create a label layout with COOP2of5 barcode type
- Create labels (make sure that the items's barcode values are numeric only!)
- Export batch and download PDF.
Without patch:
- No barcodes rendered
With patch
- Barcodes should render as expected. Test for both barcode types.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Works as described, tested both formats.
Non digit barcode is not printed.
No koha-qa errors, no t/ & xt/ errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Note: To be printed, barcode should be numerical.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 2b88f0cb38d74da93a723fd1cf3cbcf68030649e)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 0d0b4ae8486888a37ab09bd1e8f211c30e43b943)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 8e4c2bb2c7df66c13f11a408bed32da8fc1fc6dd
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Wed Nov 4 19:04:26 2015 +0100
Bug 14157: Notices tab in the patron record should not depend on EnhancedMessagingPreferences to display
Overdue and Hold notices can be sent even if EnhancedMessagingPreference
is set to "Don't Allow", so Notices tab have to be visible in all cases.
Test plan :
- without patch :
- set EnhancedMessagingPreference to "Don't Allow" and go to patron
record : there is no Notices tab
- set EnhancedMessagingPreference to "Allow" and og to patron
record: there is a Notices tab
- apply this patch :
- go to patron record, you cas see a Notices tab
- change the value of EnhanceMessagingPreferences, Notices tab is
always visible.
Followed test plan, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 471b1a8b69ff3842fbddda1e0aa068d439c85a0d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
3.20 had some other new (unrelated) things, resolved conflict and retested, all ok.
commit 1fe5ce9aa001ad57265adb7f76080cbe8ae5edd8
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Mon Oct 26 08:44:17 2015 +0100
Bug 15059: Line break in html attribute in branchoverdues.tt
In circ/branchoverdues.tt, there is a line break inside href attribute.
This generates an attribute with a lot of spaces %20.
Test plan :
- at intranet go to ciculation module
- click on "Overdues with fines"
- look at links "Phone", "Notice" and "Considered lost"
=> Without patch the URL contains a lot of spaces
=> With patch the URL is correct
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 3e0b35c15db408593b0d1a1a4c381750f8d3bec8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 345d4a0341fc7452f11c7faabefdb2750af36ca6)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 477da3c192ac65581a5e1f810789ced86cce5146
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Sep 2 17:13:41 2015 +0100
Bug 10799: Limit the SCO user to the SCO module
The SCO user should only be allowed to access to the SCO module.
This patch make the session ends if the user tries to access another
page after the SCO module.
Test plan:
0/ Configure the SCO module correctly
1/ Go on the sco main page (sco/sco-main.pl)
2/ Try to go somewhere else: you should not be logged in
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 02feeca14f4c27a05f46920545734c3a9e5455d7)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 7853b503ab8aadd98d5908768dd4252208850b04)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit ce5b361fc81938695b3a7271f803d1322d93b63b
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Nov 3 12:16:08 2015 -0300
Bug 15061: Can't add item to rotating collection
This patch prevents adding items to invalid (empty)
rotating collection id
To test:
1) Go to /cgi-bin/koha/rotating_collections/addItems.pl
2) Try to add an item, you get error show in attached pictures
3) Apply the patch
4) Go again to /cgi-bin/koha/rotating_collections/addItems.pl
5) Can't add any items
I don't know if this is a real problem
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit fff73a73837d577214fa3a9198fa97f8a50471f3)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit a6878413151477d87955c1af30994dfa5415d180)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 4bf09f1c515ae78b8623b23a10118c156896dc00
Author: Marc Véron <veron at veron.ch>
Date: Tue Oct 27 12:38:32 2015 +0100
Bug 15068: Get rid of warnings in members/summary-print.pl
This patch removes warnings when printing a summary from a member's
detail page, like:
- use of uninitialized value in sprintf
at /usr/share/kohaclone/members/summary-print.pl line 47
- Use of uninitialized value $roadtype in concatenation (.) or string
at /usr/share/kohaclone/members/summary-print.pl line 61
- Use of uninitialized value in addition (+)
at /usr/share/kohaclone/members/summary-print.pl line 87
- Argument "2015-11-03 23:59:00" isn't numeric in numeric comparison
(<=>) at /usr/share/kohaclone/members/summary-print.pl line 103
To test:
- Apply patch
- Go to a detail page with a member who has a lot of fines
- Print summary
- Verify that warnings like the ones above do no longer appear.
Signed-off-by: Frederic Demians <f.demians at tamil.fr>
Have been able to see those warnings in Apache log file, and notice
their disappearance after applying this patch.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit c292dde75b5e206045cef47d0be51235159a4b6d)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 95d9e029c8ef612b5802c6e8951344cb0f678aaf)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit c543002df14deca891ca740e129c5e93bdca269f
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date: Tue Sep 8 10:23:37 2015 +0000
Bug 14773: Move help link back out of the dropdown menu
This moves the help link back out of the dropdown menu
like it used to be.
To test:
1. Notice that in intra the help link is inside the dropdown
menu.
2. Apply the patch
3. Notice that the help link is now clearly visible in the
top right corner of the page.
Sponsored-by: Vaara-kirjastot
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 47e2b8f7d8360c059a66032f80dbb5f68b8fa925)
(cherry picked from commit 7d6a7e0b1b15cef23309a19799a16c6d930e1c08)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit eda3170f22804233ca2a3678dd5e64858c2c1358
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date: Fri Oct 30 15:28:09 2015 -0500
Bug 15094: Update link to Windows Offline Circ
This patch updates the link on the main circulation
page to point to the newest release of the offline
circulation tool.
To test:
* Go to Circulation
* Click 'Get desktop application'
* Confirm the link goes to github
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Link Ok
No errors
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit 17bcc6a242fce21e759653b2b6c6778cdda336e8)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit fdfd9464287473e7a790688cc865eb5aaee16ed3)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
commit 1a319d293c1da08f71e32a447e8c41f7ac5a25bd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Oct 14 08:48:30 2015 -0400
Bug 15010: Import patron tool creates 'duplicate' restrictions ( debarments )
If a patron has restrictions and a CSV file of patrons to be overwritten
is uploaded but has no debarred / debarredcomment columns, the a new
restriction will be added that combines all the existing restrictions (
i.e. a new debarment based on the existing borrowers.debarred
and borrowers.debarredcomment fields ).
Test Plan:
1) Create a patron with one or more restrictions
2) Import a CSV file that updates that patron, but with no debarred columns
3) Note a new restrictions is created
4) Delete the new restriction
5) Apply this patch
6) Re-import the CSV file again
7) Note that no new restriction is created
8) Add debarred and debarredcomment columns to the CSV file with a test
date and description
9) Re-import the CSV file again
10) Note the new restriction is added to the patron
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Daniel Grobani <dgrobani at samuelmerritt.edu>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
(cherry picked from commit fd123903651435c56ca14d88897e9ce4d7a38bb5)
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
(cherry picked from commit 37e7a6fe7801cacf6f89fd96b34d6b3939c9d409)
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 46 +++++-------------
C4/Auth.pm | 23 +++++++++
C4/AuthoritiesMarc.pm | 2 +-
C4/Biblio.pm | 4 +-
C4/Budgets.pm | 4 +-
C4/Charset.pm | 49 +++++++++++++++++---
C4/Labels/Label.pm | 4 +-
C4/Members.pm | 15 +++---
C4/SIP/ILS.pm | 45 ++++++++++--------
C4/SIP/ILS/Transaction.pm | 20 ++++++++
C4/SIP/ILS/Transaction/Checkout.pm | 8 +---
C4/SIP/ILS/Transaction/Renew.pm | 6 +--
C4/SIP/Sip/MsgType.pm | 2 +-
acqui/lateorders-export.pl | 4 +-
acqui/transferorder.pl | 4 ++
admin/aqplan.pl | 2 +-
debian/control | 2 +-
debian/control.in | 2 +-
etc/SIPconfig.xml | 2 +-
etc/zebradb/ccl.properties | 2 +-
etc/zebradb/etc/words-icu.xml | 2 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 -
.../intranet-tmpl/prog/en/includes/header.inc | 6 +--
.../prog/en/includes/members-menu.inc | 2 -
.../prog/en/modules/acqui/csv/lateorders.tt | 4 +-
.../prog/en/modules/acqui/transferorder.tt | 21 ++++++++-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 ++
.../en/modules/admin/preferences/cataloguing.pref | 2 +-
.../prog/en/modules/catalogue/detail.tt | 12 +++--
.../prog/en/modules/catalogue/results.tt | 16 +++++--
.../prog/en/modules/circ/branchoverdues.tt | 9 ++--
.../prog/en/modules/circ/circulation-home.tt | 2 +-
.../prog/en/modules/circ/pendingreserves.tt | 11 +++--
.../prog/en/modules/members/member.tt | 4 +-
.../prog/en/modules/patroncards/edit-batch.tt | 10 ++--
.../en/modules/rotating_collections/addItems.tt | 11 +++--
.../modules/tools/marc_modification_templates.tt | 2 +-
.../prog/en/modules/virtualshelves/sendshelf.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 8 ++++
.../bootstrap/en/modules/opac-suggestions.tt | 2 +-
members/memberentry.pl | 5 +-
members/summary-print.pl | 18 ++++---
misc/cronjobs/runreport.pl | 42 +++++++----------
opac/opac-account.pl | 3 +-
opac/opac-basket.pl | 2 +-
opac/opac-browser.pl | 2 +-
opac/opac-memberentry.pl | 2 +-
opac/opac-messaging.pl | 2 +-
opac/opac-mymessages.pl | 2 +-
opac/opac-passwd.pl | 2 +-
opac/opac-privacy.pl | 2 +-
opac/opac-ratings-ajax.pl | 5 +-
opac/opac-readingrecord.pl | 2 +-
opac/opac-reserve.pl | 3 +-
opac/opac-search-history.pl | 2 +-
opac/opac-search.pl | 4 +-
opac/opac-suggestions.pl | 5 +-
opac/opac-user.pl | 3 +-
reports/acquisitions_stats.pl | 2 +-
reports/guided_reports.pl | 1 +
t/Circulation_barcodedecode.t | 34 +++++---------
t/db_dependent/Budgets.t | 22 +++++----
tools/batch_delete_records.pl | 2 +-
tools/import_borrowers.pl | 5 +-
virtualshelves/sendshelf.pl | 2 +
66 files changed, 330 insertions(+), 224 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list