]> git.koha-community.org Git - koha.git/log
koha.git
10 years agoBug 11171: Display basket group name on the supplier list page
Jonathan Druart [Wed, 30 Oct 2013 14:48:10 +0000 (15:48 +0100)]
Bug 11171: Display basket group name on the supplier list page

Test plan:

Search supplier and verify the basket group column is filled.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Works as described.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit c9b873ff10694a9f36d15734bd2bb22e17c604c6)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11105: wrap places OPAC facet in a span
Rachel Dustin [Wed, 13 Nov 2013 03:40:23 +0000 (16:40 +1300)]
Bug 11105: wrap places OPAC facet in a span

prog-only OPAC patch.

To test:
Verify places in the facets is wrapped in a span.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit a9900b0d35bcd27483355f19985a9669e1c884e2)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11275: (follow-up) update DBIC schema class files
Galen Charlton [Wed, 27 Nov 2013 17:53:21 +0000 (17:53 +0000)]
Bug 11275: (follow-up) update DBIC schema class files

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2f4b0a5064a97f775ada288d0269c4891589da4c)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11275: DBRev 3.14.00.002
Fridolin SOMERS [Fri, 13 Dec 2013 13:45:39 +0000 (14:45 +0100)]
Bug 11275: DBRev 3.14.00.002

Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11275: make deleteditems.materials be of type text
Fridolyn SOMERS [Wed, 20 Nov 2013 13:34:36 +0000 (14:34 +0100)]
Bug 11275: make deleteditems.materials be of type text

Bug 7278 has made items.materials of type text.
It must be the same in deleteditems column.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Tested:
- definition of materials now matches between items and deleteditems
- database update works correctly

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
The only difference between tables items and deleteditems is
deleteditems.marc
Amended patch: Add a missing SetVersion in updatedb.pl

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 8aa6e51b6f684f98077dd1c3df1f847bef8d40ba)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11304: fix display of detail page holdings tab in translated Bootstrap theme
Frédéric Demians [Tue, 26 Nov 2013 10:26:54 +0000 (11:26 +0100)]
Bug 11304: fix display of detail page holdings tab in translated Bootstrap theme

Detail page tabs are not displayed properly because JavaScript is broken
in French. This is due to _(' JS string construction used in place of
_(".

This patch fixes:

  - opac-detail.tt page
  - xt/single_quotes to test bootstrap theme

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by applying the patch, running translate update, then translate
install. Saw no JavaScript error on the French detail page.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Switches from single to double quotes for translatatable strings.
Unit tests for xt/single_quotes passes now.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1b80e77f84dd864342220b89acd1210ac53a3f70)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11283: make restriction type translatable
Kyle M Hall [Fri, 22 Nov 2013 13:54:10 +0000 (08:54 -0500)]
Bug 11283: make restriction type translatable

The new restrictions system has different types:
MANUAL, OVERDUES and SUSPENSION.

Those are shown in the interface and seem to come directly from the
database, so they are not translatable.

As they are hardcoded translations should be possible and be handled in
the template.

Test Plan:
1) Create a patron with one of each type of restriction
2) Apply this patch
3) Note you see the type with only the first letter capitialized,
   this indicates you are seeing the translatable string

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. Strings now appear in
updated po files:
  msgid "%s %s Manual %s Overdues %s Suspension %s "

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 3a76f4298c0fb298cca0db31b04c0d8d5c028531)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11308: fix RSS page in bootstrap theme
Chris Cormack [Tue, 26 Nov 2013 17:17:28 +0000 (06:17 +1300)]
Bug 11308: fix RSS page in bootstrap theme

To test:
1/ Do a search in the opac, click on the rss feed icon
2/ Notice the page renders, not like an rss feed should
3/ Apply the patch and refresh
4/ Page should now be (more) valid xml

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change, big difference. With the patch the content of
the RSS feed renders like it does for the prog theme.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 71a3516d211600d35e4ddeef45f5403affc09598)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11040: DBRev 3.14.00.001
Fridolin SOMERS [Fri, 13 Dec 2013 11:01:58 +0000 (12:01 +0100)]
Bug 11040: DBRev 3.14.00.001

Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11040: Add CircAutoPrintQuickSlip option to print regular slip
Peggy Thrasher [Thu, 7 Nov 2013 23:49:51 +0000 (18:49 -0500)]
Bug 11040: Add CircAutoPrintQuickSlip option to print regular slip

This patch adds a third option to the CircAutoPrintQuickSlip system
preference.  The three options are now:

* print quick slip
* print regular slip
* clear the screen

Test plan:
1.  Set the System Preference for CircAutoPrintQuickSlip to "clear the
    screen".
    Enter a borrower barcode for checkout
    Press Enter
    The screen should be cleared.

2.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
    quick slip window"
    Enter a borrower barcode for checkout
    Press Enter
    A Quick slip is printed.

3.  Apply the patch
    Update the database using UpdateDatabase.pl

4.  Set the System Preference for CircAutoPrintQuickSlip to "clear the
    screen".
    Enter a borrower barcode for checkout
    Press Enter
    The screen should be cleared.

5.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
    quick slip window"
    Enter a borrower barcode for checkout
    Press Enter
    A Quick slip is printed.

6.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
    slip window"
    Enter a borrower barcode for checkout
    Press Enter
    A Slip is printed.

7.  Reload the database using sysprefs.sql
    Set the System Preference for CircAutoPrintQuickSlip to "clear the
    screen".
    Enter a borrower barcode for checkout
    Press Enter
    The screen should be cleared.

8.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
    quick slip window"
    Enter a borrower barcode for checkout
    Press Enter
    A Quick slip is printed.

9.  Set the System Preference for CircCircAutoPrintQuickSlip to "open a
    slip window"
    Enter a borrower barcode for checkout
    Press Enter
    A Slip is printed.

10.  Verify that the Checkout Help includes information about printing Slips.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2131c78618bb8851bc37bc99f20fa1aaa02c3124)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
Conflicts:
installer/data/mysql/updatedatabase.pl

10 years agoBug 6435: (follow-up) make -daemon really imply -a and -b
Galen Charlton [Sun, 24 Nov 2013 18:20:56 +0000 (18:20 +0000)]
Bug 6435: (follow-up) make -daemon really imply -a and -b

This patch follows up on the previous patch by moving the
check for whether authority and/or biblio indexing have been
specified so that -daemon has a chance to set those modes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b25de3e7cf53265f0ded8e3ab4cce82457b8f14d)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 6435: (follow-up) rebuild_zebra -daemon option now smarter
Doug Kingston [Sun, 17 Nov 2013 21:09:02 +0000 (13:09 -0800)]
Bug 6435: (follow-up) rebuild_zebra -daemon option now smarter

Based on feedback, make daemon mode imply -z -a -b and abort
on startup if flags incompatible with an incremental update daemon
are used.  Update documentation to match.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 00240d6970795a176a12fb2d24fcd38e069d037f)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 6435: Add daemon mode to rebuild_zebra.pl
Doug Kingston [Mon, 28 Oct 2013 00:18:17 +0000 (17:18 -0700)]
Bug 6435: Add daemon mode to rebuild_zebra.pl

This change adds code to check the zebraqueue table with a cheap SQL query
and a daemon loop that checks for new entries and processes them incrementally
before sleeping for a controllable number of seconds.  The default is 5 seconds
which provides a near realtime search index update.  This is desirable particularly
for libraries that are doing active catalogue updating.  The query is adjusted
based on whether -a, -b, or -a -b are specified.

Help text updated.  Tested against a live 3.12 system.

Note that this fix will benefit from the fix to lack of locking (bug 11078)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 1b0992e8d5a2bc8f0f74623daa9a7eac4786644a)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11125: Correct display for patron messaging preferences on OPAC
Sophie Meynieux [Wed, 23 Oct 2013 16:00:29 +0000 (18:00 +0200)]
Bug 11125: Correct display for patron messaging preferences on OPAC

 To test :
 1) Remove 'sms' from message_transport_types table
 2) Go on OPAC "My messaging" tab => table columns are out of alignment with table heading
 3) Apply patch => table is correctly displaid

Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7021d36d0e58fe2acd0ae4ee7c9e658df2cc74be)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11222: fix crash that can occur in search for items to add to label batch
Zeno Tajoli [Fri, 8 Nov 2013 17:10:08 +0000 (17:10 +0000)]
Bug 11222: fix crash that can occur in search for items to add to label batch

This patch fixes a regression on label-item-search.pl introduced by
the patch for bug 9239 where searching for items to add to a label
batch fails with an error if QueryParser is not enabled and you use
the "Added on or before date" search option.

Test plan:

0) Set "UseQueryParser" to "do not try"
1) Start with an installation with bibliografic data and items
   information.
2) Check that in items there are values inside Accession Date

Without the patch:
a) Go in Home› Tools› Labels  and click on 'New batch'
b) Click on 'Add Item(s)'
c) Try to select items with option "Added on or before date"
d) You will receive an error

With the patch:
Try steps a),b), and c)
Now you don't receive an error and you can select items

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Added a description of the problem and copied the test plan from the bug
report, with the addition of the information that QueryParser must be
off to confirm and test.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 69c42067ced1da3821e8a893c76c2f1f1195f946)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 7491: improve description of the item-level_itypes syspref
Marcel de Rooy [Thu, 7 Nov 2013 13:25:50 +0000 (14:25 +0100)]
Bug 7491: improve description of the item-level_itypes syspref

Adding some text to the pref description referring to OPAC display.

Test plan:
Look at the new description in Cataloging preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 5dcf1857dac7d4c4a75a4e630938b8462542bcf3)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11146: Show a go back link on no permission page
Fridolyn SOMERS [Mon, 28 Oct 2013 12:46:06 +0000 (13:46 +0100)]
Bug 11146: Show a go back link on no permission page

When a user does not have permissions for a page or module, the
authentication page is displayed with message

  "Error: You do not have permission to access this page.".

Most librarians uses the "previous page" button of their browser to
come back on the page they were before trying to get to the
non-permitted page.

This patch adds a button to help coming back to previous page.
It also changes the "Click to log out" link as a button.

Test plan :
- Define a user with staff permissions but no permission on tools module
- Login with this user
=> You get to intranet home page
- Edit URL to go to tools module : cgi-bin/koha/tools/tools-home.pl
=> You get a page with a red error message and 2 buttons "Previous page"
   and "Log out"
- Click on "Previous page"
=> Go get to intranet home page
- Edit URL to go to tools module : cgi-bin/koha/tools/tools-home.pl
- Click on "Log out" button
=> You are logged-out and get to authentication page : cgi-bin/koha/mainpage.pl?logout.x=1

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Works as intended.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit d1bec841428de08402628e21b75f7fc6c6e0c361)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11238: contruct links to the appropriate manual version dynamically
Jonathan Druart [Thu, 28 Mar 2013 10:40:52 +0000 (11:40 +0100)]
Bug 11238: contruct links to the appropriate manual version dynamically

This patch uses the version number of the Koha database to
dynamically generate links from help to the appropriate version
of the manual.

Test plan (for 3.15 branch):
- Open a help page
- Verify the manual link is correct (point to 3.14 manual)
- change the version in mysql:
update systempreferences set value="3.1600000" where variable="version";
- Verify the manual link now points to the future 3.16 manual.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. No koha-qa errors

Tested on top of Bug 10671
On master (BD version 3.13.xxx) help links point to 3.12 manual
Changing version to 3.14/15 points to 3.14 manual
Changing version to 3.16 points to the future :)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 572c586793548988279ce908e951146d356f0322)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11061: remove unused routine Koha::Calendar::_mock_init
Jonathan Druart [Wed, 16 Oct 2013 11:55:22 +0000 (13:55 +0200)]
Bug 11061: remove unused routine Koha::Calendar::_mock_init

Bug 9209 removes the only occurrence to Koha::Calendar::_mock_init
The routine can be removed.

Test plan:
prove t/Calendar.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
I left that routine because I planned to do a follow-up for that so the
Calendar patch series was pushed soon. Nice catch Jonathan, works as expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passes koha-qa.pl, t and xt

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 55b13c092a6b4a1d1e89e08837e2f0c1d2bb84b9)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 10996: Allow numeric subfields to be stripped on export
Colin Campbell [Fri, 4 Oct 2013 10:01:27 +0000 (11:01 +0100)]
Bug 10996: Allow numeric subfields to be stripped on export

Regex assumed all numeric characters were part of the tag number
This is obviously false as $9 would be a likely candidate
to be removed on export.

The code can be any printing ascii character other than space
according to LoC's website.

Also changed regexp to no longer allow a zero length tag number
which is nonsensical.

The old regex would accept shorter than 3 digit tags but these were
not stripped so I've removed that option, considering it a bug
not a feature

NB assumption that the code makes that a tag is always numeric is
incorrect but works in practice. Handling non-numeric tags is
a 'To be done'

Made code dependent on the regex succeeding. Picking up results
from a previous regex on failure can lead to weird hard to
identify bugs

In the course of testing Paola Rossi <paola.rossi@cineca.it>
spotted that the delete operation was flawed, only removing
the first occurence of the specified tag/tag subfield. Reworked
the delete loop to operate on all occurences

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 248283fc29b46f59c56769a14f8d811cc61834ff)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11245: fix typo in modborrowers.tt javascript string
Fridolyn SOMERS [Wed, 13 Nov 2013 15:29:40 +0000 (16:29 +0100)]
Bug 11245: fix typo in modborrowers.tt javascript string

In modborrowers.tt, Bug 8986 made the javascript strings translatable:
  _("This attribute will be only applied to the patron\'s category")

In this case, the backslash is useless.

Test plan :
- Create a borrower attribute with a "Category" defined
- Go to Tools / Batch patrons modification
- Enter a cardnumber and submit
- Next to "Attribute", select the borrower attribute you created
=> You see a grey text at the right : This attribute will be only
   applied to the patron's category "XXX"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 2a4fa0a80307bf61a82a180220504c633000db7f)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 10809: use branches template plugin in serials search
Fridolyn SOMERS [Fri, 30 Aug 2013 13:19:25 +0000 (15:19 +0200)]
Bug 10809: use branches template plugin in serials search

In serials-search.pl, branch name was computed using branch code and
then passed to template.

This patch uses the new template plugin now for this:
    Koha::Template::Plugin::Branches.

Test plan :
- Go to serials search
- Perform a search that returns at least an open an a closed subscription having a branch defined
=> The branch name is displayed in "Library" column

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit 7ca790997ed6adebb7edafc04b6f1aa136ce7cc2)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 11207: fix issue where SMS number couldn't be cleared when editing patron
Jonathan Druart [Wed, 6 Nov 2013 11:33:59 +0000 (12:33 +0100)]
Bug 11207: fix issue where SMS number couldn't be cleared when editing patron

Test plan:
1/ edit a patron
2/ set a sms alert number
3/ save
4/ edit the patron
5/ set the sms alert number to a blank value
6/ save
7/ the sms number is now an empty string

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

Test plan used:
- Activate the SMS functionality by giving a 'fake'
  SMSSendDriver of TEST
- Activate EnhancedMessagingPreferences
- Create a new patron, set Other phone to 'test'
- Notice that Other phone was copied to sms number
- Edit messaging preference section using the edit link
  below on the details tab and delete SMS number
- Verify it's not possible to unset the SMS number
- Apply patch
- Repeat deleting - this time it works

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit b15f25d8c672d198cd074fd16f01e1f67fef955e)
Signed-off-by: Fridolin SOMERS <fridolin.somers@biblibre.com>
10 years agoBug 7143: Cleaning up docs/history.txt
Marcel de Rooy [Thu, 21 Nov 2013 08:27:39 +0000 (09:27 +0100)]
Bug 7143: Cleaning up docs/history.txt

Sorting some lines on date
Typo on date for Bernardo Kriegel
Splitting one line in 2008 in two lines
Replacing some tabs with spaces in October 2013

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No typos or problems found.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11307: (follow-up) apply fix to bootstrap theme (master and 3.14.x only)
Chris Cormack [Tue, 26 Nov 2013 16:51:19 +0000 (05:51 +1300)]
Bug 11307: (follow-up) apply fix to bootstrap theme (master and 3.14.x only)

To test:
Same as first patch, but using bootstrap theme

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11307: Fix potential XSS attack in public catalog RSS feed
Chris Cormack [Tue, 26 Nov 2013 16:37:07 +0000 (05:37 +1300)]
Bug 11307: Fix potential XSS attack in public catalog RSS feed

To test:
1/ Craft a url like
/cgi-bin/koha/opac-search.pl?q=a&count=50"'<h1>test</h1>&sort_by=acqdate_dsc&format=rss2
2/ look at the source, notice
<opensearch:itemsPerPage>50"'<h1>test</h1></opensearch:itemsPerPage>
3/ apply the patch, and reload url
4/ source now contains
 <opensearch:itemsPerPage>50&quot;'&lt;h1&gt;test&lt;/h1&gt;</opensearch:itemsPerPage>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoUpdate history.txt for Koha 3.14.0 release v3.14.00
Galen Charlton [Thu, 21 Nov 2013 01:58:05 +0000 (01:58 +0000)]
Update history.txt for Koha 3.14.0 release

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agorelease notes for Koha 3.14.0
Galen Charlton [Thu, 21 Nov 2013 01:40:18 +0000 (01:40 +0000)]
release notes for Koha 3.14.0

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoDBRev 3.14.00.000: Koha 3.14.0
Galen Charlton [Thu, 21 Nov 2013 00:53:22 +0000 (00:53 +0000)]
DBRev 3.14.00.000: Koha 3.14.0

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoTranslation updates for 3.14.0
Bernardo Gonzalez Kriegel [Wed, 20 Nov 2013 17:58:32 +0000 (14:58 -0300)]
Translation updates for 3.14.0

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11269' into 3.14.x
Galen Charlton [Tue, 19 Nov 2013 16:28:57 +0000 (16:28 +0000)]
Merge branch 'new/bug11269' into 3.14.x

10 years agoBug 11269: fix incorrect use of MARC::Field->subfield()
Tomas Cohen Arazi [Mon, 18 Nov 2013 22:04:56 +0000 (19:04 -0300)]
Bug 11269: fix incorrect use of MARC::Field->subfield()

MARC::Record 2.0.6+ enables the warnings pragma, and as a
consequence, started logging cases where a routine in
C4::Search was calling MARC::Field->subfield() with an undef
subfield label.  This patch removes the log noise.

To test:
- Run prove -v t/db_dependent/Search.t
- There will be warnings about
  "Use of uninitialized value $code_wanted in string" in MARC::Field.
- Apply the patch.
- Those warnings are gone.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tests now pass

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug8854' into 3.14.x
Galen Charlton [Tue, 19 Nov 2013 16:12:50 +0000 (16:12 +0000)]
Merge branch 'new/bug8854' into 3.14.x

10 years agobug 8854: fix some invoice search filters
Galen Charlton [Tue, 29 Jan 2013 17:42:12 +0000 (09:42 -0800)]
bug 8854: fix some invoice search filters

Fix the supplier, shipment date, and library filters
on the invoice search.  An invoice's library is
(in parallel with order search) defined as the library
of the staff member that approved the basket.  Before this
patch, the code was referring to an aqorders.branchcode
column that doesn't exist.

This patch also improves the author, title, ISBN/EAN/ISSN,
publisher, and publication year filters to no longer require
exact matches; substring matches now suffice.

Finally, this patch considers biblio.copyrightdate in addition
to biblioitems.publicationyear for publication date searches, as
the MARC21 frameworks use the former column but not the latter.

This patch also fixes the current test cases for invoices
so that they pass and adds regression tests.

Test plan:

[1] Create two invoices for different vendors.
[2] Do an invoice search and filter on shipment
    date.  Verify that the expected invoice(s)
    are returned.
[3] Do an invoice search and filter on branch
    (of the staff member that approved the basket).
    Verify that the expected invoice(s) are returned.
[4] Do an invoice search and filter on supplier.
    Verify that the expected invoice(s) are returned.
[5] Do invoice searches on author, title, ISBN/EAN/ISSN,
    publisher, and publication year and verify that the
    results are as expected.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Patch passes all tests, test plan and QA script.

(Adding from Katrin notes early) I agree with
Possible improvements:
- Document the behaviour of the library search as there are
  lots of branches all over acquisitions with different meaning.
- Add the shipment date to the results list table
- Change label ISBN/EAN/ISSN to not include EAN for MARC21
  installations

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11221' into 3.14.x
Galen Charlton [Tue, 19 Nov 2013 15:48:39 +0000 (15:48 +0000)]
Merge branch 'new/bug11221' into 3.14.x

10 years agoBug 11221: (follow-up) test for NULL rather than empty string
Galen Charlton [Tue, 19 Nov 2013 15:35:25 +0000 (15:35 +0000)]
Bug 11221: (follow-up) test for NULL rather than empty string

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11221: (follow-up) add unit test to test handling empty strings as dates
Chris Cormack [Sun, 17 Nov 2013 06:57:38 +0000 (19:57 +1300)]
Bug 11221: (follow-up) add unit test to test handling empty strings as dates

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11221: ensure that SQLHelper uses NULL rather than 0000-00-00 as default date...
Jonathan Druart [Tue, 12 Nov 2013 14:07:54 +0000 (15:07 +0100)]
Bug 11221: ensure that SQLHelper uses NULL rather than 0000-00-00 as default date value

The default values for date fields is undef, so if a date field contains
an empty string, we should insert NULL in the DB, not 0000-00-00.
The format_date_in_iso routine should be only called if a date is
defined, is not equal to an empty string and does not match the iso
regex.

This patch fixes a bug where editing or creating a patron record
without setting the birth date results in 0000-00-00 rather than null
being set as the dateofbirth value.

Partial test plan:
1. Create a new patron. Leave dateofbirth empty.
2. Save the record.
3. Open the record for editing.
4. Save the record without making changes.
5. Koha gives no error.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Now when no date is given NULL is saved to the database.

Tested:
- Adding a patron without date of birth
- Editing the patron, entering a date of birth
- Editing the patron, deleting date of birth
All worked as expected.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11163' into 3.14.x
Galen Charlton [Fri, 15 Nov 2013 15:35:22 +0000 (15:35 +0000)]
Merge branch 'new/bug11163' into 3.14.x

10 years agoBug 11163: display correct itemtype usage count when deleting an itemtype
Tomas Cohen Arazi [Tue, 29 Oct 2013 21:39:22 +0000 (18:39 -0300)]
Bug 11163: display correct itemtype usage count when deleting an itemtype

Wrong usage of UNION instead of UNION ALL prevented the count to match
the expected value.

Steps to reproduce:
- Create an itemtype.
- Create some biblios setting the created itemtype at biblio level.
- Create some items setting the created itemtype on them.
- Try to delete the itemtype in Home > Administration > Item types, the
count is 1 and doesn't match the expected result.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11185' into 3.14.x
Galen Charlton [Fri, 15 Nov 2013 15:32:05 +0000 (15:32 +0000)]
Merge branch 'new/bug11185' into 3.14.x

10 years agoBug 11185: fix bug preventing check-url-quick.pl from working
Frédéric Demians [Fri, 1 Nov 2013 09:39:23 +0000 (10:39 +0100)]
Bug 11185: fix bug preventing check-url-quick.pl from working

Revert commit f88f11b4f805a70c9748bc3676cb1ce086db2ce8

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Before this patch, check-url-quick.pl fails with an error. After the
patch it runs correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug10671' into 3.14.x
Galen Charlton [Fri, 15 Nov 2013 00:30:11 +0000 (00:30 +0000)]
Merge branch 'new/bug10671' into 3.14.x

10 years agoBug 10671: Update Circ Help Files
Nicole C. Engard [Thu, 24 Oct 2013 03:32:48 +0000 (23:32 -0400)]
Bug 10671: Update Circ Help Files

This patch updates the existing help files and
adds the missing offline circ help file.

To test:

* Visit all circ pages and check the manual links
* Visit the new offline circulation page and confirm text
and link are there (link will work after 10/25)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug10670' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 23:54:24 +0000 (23:54 +0000)]
Merge branch 'new/bug10670' into 3.14.x

10 years agoBug 10670: ensure koha-start-zebra sets problem permissions for logs
Dobrica Pavlinusic [Thu, 1 Aug 2013 11:26:03 +0000 (13:26 +0200)]
Bug 10670: ensure koha-start-zebra sets problem permissions for logs

If koha-common is started when Zebra log files are owned by root
it will fail to start without any useful message (since Zebra can't
write errors in log files because it lacks permissions to do so).

This patch creates empty log files and ensure they have correct
permissions.

I can't pin-point why log files gets owned root, but I suspect it
has something to do with Zebra crashing and logrotate, but this is
just theory. We have seen this behaviour since koha 3.1 every
few months, and every time it happends we have root owned logs and
crashed Zebra so this patch will at least help sites which have
some kind of automatic koha-common start if it's not running.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11240' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 23:08:15 +0000 (23:08 +0000)]
Merge branch 'new/bug11240' into 3.14.x

10 years agoBug 11240: ensure that date of restriction is saved when using patron edit screen
Chris Cormack [Tue, 12 Nov 2013 22:05:32 +0000 (11:05 +1300)]
Bug 11240: ensure that date of restriction is saved when using patron edit screen

To test:

1/ Edit a patron
2/ Add a restriction with a date (in any format other than iso)
3/ Note the date is not saved
4/ Apply patch
5/ Add restriction again, note it is saved

The problem is output_pref was being called with the wrong parameters

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Note: The issue in on the memberentry form only (not the restriction
form on the check out page).

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11196' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 19:07:23 +0000 (19:07 +0000)]
Merge branch 'new/bug11196' into 3.14.x

10 years agoBug 11196: DBrev 3.13.00.043
Galen Charlton [Thu, 14 Nov 2013 19:06:46 +0000 (19:06 +0000)]
Bug 11196: DBrev 3.13.00.043

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11196: Add SearchEngine syspref in the DB if missing
Jonathan Druart [Wed, 13 Nov 2013 11:13:27 +0000 (12:13 +0100)]
Bug 11196: Add SearchEngine syspref in the DB if missing

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agobug 11196: put SearchEngine to sysprefs.sql
Srdjan [Mon, 4 Nov 2013 01:03:09 +0000 (14:03 +1300)]
bug 11196: put SearchEngine to sysprefs.sql

To test:

Check that sysprefs.sql runs correctly.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug10684_take2' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 18:06:51 +0000 (18:06 +0000)]
Merge branch 'new/bug10684_take2' into 3.14.x

10 years agoBug 10684: (follow-up) adjust how undecodable records are logged
Jonathan Druart [Mon, 26 Aug 2013 15:37:14 +0000 (17:37 +0200)]
Bug 10684: (follow-up) adjust how undecodable records are logged

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10684: make sure that Koha search does not dies on undecodable records
Kyle M Hall [Mon, 5 Aug 2013 13:28:19 +0000 (09:28 -0400)]
Bug 10684: make sure that Koha search does not dies on undecodable records

When a record fails to decode during a search, Koha dies with an error.
Koha should ignore bad records and continue on ( and log the error ).

An example of a record that Zebra will happily ingest but which MARC::Record
doesn't like is one that contains a punctuation character in a tag label.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 10684: add regression test
Galen Charlton [Thu, 14 Nov 2013 16:50:37 +0000 (16:50 +0000)]
Bug 10684: add regression test

This patch adds a regression test for Koha's ability
to gracefully handle records that Zebra will index but
which MARC::Record won't parse.  In particular, MARC::File::USMARC
croaks on records that contain non-alphanumeric characters in the
tag name.

To test:

[1] After applying this test, run prove -v t/db_dependent/Search.t
    The test script will die when it gets to the regression test.
[2] After applying the main patches that fix the bug, the test
    script should pass.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11137' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 15:52:27 +0000 (15:52 +0000)]
Merge branch 'new/bug11137' into 3.14.x

10 years agoBug 11137: fix certain types of searches run using QueryParser
Galen Charlton [Thu, 24 Oct 2013 20:42:38 +0000 (20:42 +0000)]
Bug 11137: fix certain types of searches run using QueryParser

QueryParser was loading redundant search aliases, which in turn resulted
in certain queries involving two or more clauses joined by a Boolean
operator getting parsed in correctly.

To test:

[1] Enable QueryParser.
[2] Arrange your database so that some some bib records contain
    the keyword 'history' while a smaller subset contain
    both 'history' and 'earth'.  (The exact words used don't
    matter.)
[3] Run the following search from the OPAC global search bar:

    kw:history && kw:earth

[4] Observe that the records that are returned include *all* bibs
    in the database with the keyword 'history'.  In other words, the
    restriction  that the records must also contain 'earth' is not
    observed.
[5] Apply the patch and rerun the search.
[6] This time, the results that are returned should include only those
    that contain both 'history' and 'earth'.
[7] Verify that prove -v t/QueryParser.t passes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes test plans, all tests and QA script.
Also checked the db_dependent/Search.t tests.
Tried some other searches, all seems to be working correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
I reproduce the bug and I confirm this patch fixes it.
Without the patch, kw:history && kw:earth, I got:
  Search biblios OK 4 1 1+0 RPN @attrset Bib-1 @attr 4=6 @attr 1=1016 history
With the path, I get:
   Search biblios OK 2 1 1+0 RPN @attrset Bib-1 @and @attr 4=6 @attr 1=1016 history @attr 4=6 @attr 1=1016 earth

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11137: regression tests for QP search field alias bug
Galen Charlton [Thu, 24 Oct 2013 20:25:55 +0000 (20:25 +0000)]
Bug 11137: regression tests for QP search field alias bug

This patch adds regression tests to verify that
Boolean searches using QueryParser function correctly.

This patch also ensures that QP is correctly initalized
when Search.t is run.

To test:

[1] Apply this patch and the following patch.
[2] Verify that prove -v t/QueryParser.t works
[3] Verify that prove -v t/db_dependent/Search.t works
[4] (optional) instead of applying both patches at the same
    time, apply only the regression test patch and run the
    tests listed in steps 2 and 3.  The following tests
    should fail:

t/db_dependent/Search.t (Wstat: 512 Tests: 198 Failed: 2)
  Failed tests:  42, 71
  Non-zero exit status: 2
t/QueryParser.t (Wstat: 256 Tests: 28 Failed: 1)
  Failed test:  12
  Non-zero exit status: 1

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11216' into 3.14.x
Galen Charlton [Thu, 14 Nov 2013 15:44:52 +0000 (15:44 +0000)]
Merge branch 'new/bug11216' into 3.14.x

10 years agoBug 11216: fix bug where editing patron creates indefinite manual restriction
Dobrica Pavlinusic [Fri, 8 Nov 2013 13:50:38 +0000 (14:50 +0100)]
Bug 11216: fix bug where editing patron creates indefinite manual restriction

Editing partron data results in unintended adding of indefinite manual
restriction to it. Reason for it is hidden field add_debarment which
is wrongly initialized to 1 instead of 0. Also JavaScript code seems
to want to toggle checkbox, and since this field is hidden correct
approach would be to change its value to 1.

Test scenario:

1. edit patron data
2. verify that debarrment is wrongly added
3. remove debarrment
3. apply this patch
4. edit patron again
5. verify that debarrment wasn't added
6. intentionally add debarrment and verify that it's saved
7. add debarment, enter something in comment but press cancel
   and verify that debarment isn't added

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This fixes this blocker, however, with or without the patch, the date
is not saved correctly. I will file a new bug for that

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11205' into 3.14.x
Galen Charlton [Sat, 9 Nov 2013 16:31:02 +0000 (16:31 +0000)]
Merge branch 'new/bug11205' into 3.14.x

10 years agoBug 11205: fix DataTables filter issue when more than one table is on a page
Jonathan Druart [Tue, 5 Nov 2013 17:07:56 +0000 (18:07 +0100)]
Bug 11205: fix DataTables filter issue when more than one table is on a page

This patch fixes a bug where if there are more than one table on the
same page that uses the DataTables column filter, applying a filter on
one table applied it to both.

Test plan:
1/ Go on serials/serials-search.pl?searched=1
2/ Filter on a column (e.g., title) on the open subscriptions
   table.
3/ Switch to the closed subscriptions table.  Observe that
   that the table is *also* filtered by the criteria
   set for the open subscriptions table.
4/ Apply the patch and reload the page.
5/ This time, applying a filter on one time should not affect
   the other table.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11159' into 3.14.x
Galen Charlton [Fri, 8 Nov 2013 16:29:36 +0000 (16:29 +0000)]
Merge branch 'new/bug11159' into 3.14.x

10 years agoBug 11159: fix small typo in catalogue/results.tt
Fridolyn SOMERS [Tue, 29 Oct 2013 13:17:45 +0000 (14:17 +0100)]
Bug 11159: fix small typo in catalogue/results.tt

In catalogue/results.tt, there is a small HTML error line 377 :
[% ELSE %]<option value"au,phr">Author</option>[% END %]
The = is missing

Test plan :
- In intranet, test go to advanced search
- Click on [More options]
- Enter a term, check "Scan indexes" and click on "Search"
- Look at HTML code of select "Indexed in"
=> option "Author" is correct : <option value="au,phr">Author</option>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoMerge branch 'new/bug11218' into 3.14.x
Galen Charlton [Fri, 8 Nov 2013 16:24:56 +0000 (16:24 +0000)]
Merge branch 'new/bug11218' into 3.14.x

10 years agoBug 11218: (follow-up) fix whitespace
Galen Charlton [Fri, 8 Nov 2013 16:21:26 +0000 (16:21 +0000)]
Bug 11218: (follow-up) fix whitespace

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11218: (follow-up) fix some whitespace and a variable declaration
Katrin Fischer [Fri, 8 Nov 2013 07:33:29 +0000 (08:33 +0100)]
Bug 11218: (follow-up) fix some whitespace and a variable declaration

Fixing some things the QA script pointed out this morning:

- whitespace
- variable declaration

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11218: fix Item Due notices not being generated
Katrin Fischer [Thu, 7 Nov 2013 23:31:09 +0000 (00:31 +0100)]
Bug 11218: fix Item Due notices not being generated

To test:
- Check out at least 3 items, due dates should be today, sometime in
  the past and one day after tomorrow.
- Edit the message options - activate DUE and PREDUE notices with
  days in advance = 2
- Run the advance_notices.pl script with -v -c
  Result: Only a PREDUE notice is generated
- Run the advance_notices.pl script with -v -c -m 2
  Result: Only the PREDUE message is generated correctly.
- Run t/db_dependent/Circulation.t
  - without first patch: all tests pass.
  - with first patch: some tests will fail.
- Apply patch.
- Rerun script, now PREDUE and DUE notices should be
  generated.
- Run t/db_dependent/Circulation.t again, all tests should pass.

Add more items with different due dates, rerun and check results.

Run t/Circulation.t to confirm all tests pass.
- Apply the patch

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes functional tests and automated tests.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
10 years agoBug 11218: regression tests for Due notice generation
Katrin Fischer [Thu, 7 Nov 2013 23:26:45 +0000 (00:26 +0100)]
Bug 11218: regression tests for Due notice generation

Changes tests for GetUpcomingDueIssues:

days_in_advance should be inclusive:
 2 should find items due in 2 days from now.
 1 should find items due tomorrow.
 0 should only find items due today.

Adds new tests for Bug 11218:

As the advance_notices.pl, the only script using GetUpcomingDueIssues
is not only used for PREDUE notices, but also for
DUE notices, we need to also select items due today.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 11204: make pendingreserves use datatables.inc
Jonathan Druart [Tue, 5 Nov 2013 16:58:17 +0000 (17:58 +0100)]
Bug 11204: make pendingreserves use datatables.inc

A JS error occurs on the pending reserves (holds to pull) page:

ReferenceError: CONFIG_EXCLUDE_ARTICLES_FROM_SORT is not defined
if(CONFIG_EXCLUDE_ARTICLES_FROM_SORT){

Test plan:
Apply the patch and verify the error does not appear anymore.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 11204: make pendingreserves use datatables.inc
Jonathan Druart [Tue, 5 Nov 2013 16:58:17 +0000 (17:58 +0100)]
Bug 11204: make pendingreserves use datatables.inc

A JS error occurs on the pending reserves (holds to pull) page:

ReferenceError: CONFIG_EXCLUDE_ARTICLES_FROM_SORT is not defined
if(CONFIG_EXCLUDE_ARTICLES_FROM_SORT){

Test plan:
Apply the patch and verify the error does not appear anymore.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoupdated release notes for 3.14.0 beta v3.14.00-beta
Galen Charlton [Fri, 1 Nov 2013 15:04:49 +0000 (15:04 +0000)]
updated release notes for 3.14.0 beta

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoDBRev 3.13.00.042: mark Koha 3.14 beta
Galen Charlton [Fri, 1 Nov 2013 14:22:26 +0000 (14:22 +0000)]
DBRev 3.13.00.042: mark Koha 3.14 beta

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10403: (follow-up) fix test to use vendor created earlier during test
Galen Charlton [Fri, 1 Nov 2013 02:31:22 +0000 (02:31 +0000)]
Bug 10403: (follow-up) fix test to use vendor created earlier during test

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 8307: (follow-up) fix discrepancy in name of the new syspref
Galen Charlton [Fri, 1 Nov 2013 00:46:16 +0000 (00:46 +0000)]
Bug 8307: (follow-up) fix discrepancy in name of the new syspref

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 11132: don't clear the results list upon adding a biblio to a list
Jonathan Druart [Thu, 24 Oct 2013 15:06:08 +0000 (17:06 +0200)]
Bug 11132: don't clear the results list upon adding a biblio to a list

A "busc" param is cleared if the template name is not opac-.*detail.tt.
So if a user adds a biblio to a list, he cannot continue to browse
results.

Test plan:
- launch a search at the OPAC (opac-search.pl).
- click on a result and browse results (using previous/next links).
- a title attract your attention and you add it to a list
  ("Save to yours lists" link on the right).
- save the list.
- browse again results.

Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, also checked some other pages and actions
accessible from the detail page.
Passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 11033: Make Save button and Cancel link always visible on basketgroup page
Mathieu Saby [Thu, 10 Oct 2013 11:34:37 +0000 (13:34 +0200)]
Bug 11033: Make Save button and Cancel link always visible on basketgroup page

This patch suppresses the first CSS declaration in basketgroup.tt. It was
unneeded, and was the cause of the Save button and Cancel link not
being visible if the bar for changing language was activated.

To test :
1. activate the "language" syspref, with at least 2 languages
2. open a basketgroup : the 'Save' button and 'Cancel' link are now visible
   at the bottom of basketgroup page
3. Check you can use the basketgroup as before : put a basket in it, cancel, save etc.

Signed-off-by: Koha Team Amu <koha.aixmarseille@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10720: fix issue that prevented use of HTML tags in overdue notices
Sophie Meynieux [Tue, 13 Aug 2013 16:14:21 +0000 (18:14 +0200)]
Bug 10720: fix issue that prevented use of HTML tags in overdue notices

Substitution term in overdue notices shouldn't be removed if they don't match.
It prevents use of HTML in notices to use with CSS.

Test plan :
- define an overdue notice containing some valid substitution terms + some valid html tags (<strong> or <div class="my class" to use with a css
- find a borrower with overdues that trigger this notice
- run overdue_notices.pl -html <directory>

Without patch, your html tags are missing in your html file
With the patch, they are present and can be used with a css to generate a formatted pdf file.

If you add some invalid substitution term, with the patch, they are still in the final letter, but the warn in the log helps you to correct your notice template.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 7684: (follow-up) fix UTF-8 encoding problems in CSV export
Galen Charlton [Fri, 1 Nov 2013 00:25:08 +0000 (00:25 +0000)]
Bug 7684: (follow-up) fix UTF-8 encoding problems in CSV export

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 7684: (follow-up) use datatables.inc
Galen Charlton [Fri, 1 Nov 2013 00:17:35 +0000 (00:17 +0000)]
Bug 7684: (follow-up) use datatables.inc

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 7684: (follow-up) fix crash when generating the CSV
Jonathan Druart [Fri, 11 Oct 2013 14:29:34 +0000 (16:29 +0200)]
Bug 7684: (follow-up) fix crash when generating the CSV

The cgi argument in missing for routine
C4::Reports::Guided::_get_column_defs. It causes a crash on generating
the CSV file.

Signed-off-by: Koha Team Amu <koha.aixmarseille@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 7684: QA Followup and bugfixes
Jonathan Druart [Thu, 6 Jun 2013 12:37:19 +0000 (14:37 +0200)]
Bug 7684: QA Followup and bugfixes

This followup fixes some QA issues:
- replace the MySQLism SQL_CALC_FOUND_ROWS
- use Koha::DateUtils instead of C4::Dates
- replace "branch" and "location" with "library"
- fixe wrong capitalisation on "Clear all" and "Select all"

and fixes some behaviors:
- the inventory tools can be used without barcode file (fixed for the
  csv export too).
- mark as not scanned a non scanned item.
- update the datelastseen 1 time per biblio (and fixes the displayed
  count)

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Koha Team Amu <koha.aixmarseille@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 7684: multiple fixes for inventory
Matthias Meusburger [Thu, 23 Aug 2012 14:02:52 +0000 (16:02 +0200)]
Bug 7684: multiple fixes for inventory

* when a file was uploaded and the comparison with catalogue range
 requested, the comparison was wrong: the logic was wrong
* items that were not supposed to be scanned (ie: supposed to be on another shelf)
  didn't had the author and title, it was hard to retrieve them on the shelved
* some useful fields were missing, like homebranch, location, status
* the CSV export contained all the item information. It should contain the same
   informations as the screen

Behaviour now:
   * scan a list of barcode & select a range of location
   * if a barcode has been scanned and should not be (misplaced item),
       the information is displayed
   * if you choose "compare barcodes list to result option", the
     resulting list contains all items that have been scanned and those
     that were supposed to be. Any item not in both list appears with a
     specific message on the last column

Signed-off-by: Leila <koha.aixmarseille@gmail.com>
Signed-off-by: Koha Team Amu <koha.aixmarseille@gmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9374: (follow-up) add FIXME suggesting that use of a regexp is not the long-term...
Galen Charlton [Fri, 1 Nov 2013 00:08:04 +0000 (00:08 +0000)]
Bug 9374: (follow-up) add FIXME suggesting that use of a regexp is not the long-term solution

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9374: The color should manage all zero format.
Jonathan Druart [Thu, 19 Sep 2013 15:03:00 +0000 (17:03 +0200)]
Bug 9374: The color should manage all zero format.

The format of prices in Koha is discuted in some bugs (e.g. 9410).
The good way will be to introduce a syspref in order to deal with the
number of decimal.
The previous patch is too restrictive, we should deal with other zero
format.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9374: Only 0.00 prices must have class error in basket.tt
Mathieu Saby [Sun, 15 Sep 2013 11:09:20 +0000 (13:09 +0200)]
Bug 9374: Only 0.00 prices must have class error in basket.tt

A regexp '^0' in basket.tt is used to give the class "error" to null prices.
It is wrong, because it matches prices like "0.15". It should only match "0.00".

To test :
- apply the patch
- display a basket with an order with a price between 0 and 1 (like "0.50") and an order with a price stricty null ("0.00")
- only the "0.00" price should be displayed in red

Signed-off-by: Cedric Vita <cedric.vita@dracenie.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9780: (follow-up) suppress line feeds in javascript
Mathieu Saby [Mon, 21 Oct 2013 17:24:34 +0000 (19:24 +0200)]
Bug 9780: (follow-up) suppress line feeds in javascript

This patch suppress \n in javascript, in order to keep Pootle quiet.

String patch, no need to test I think.
But if you want to test, replay the test plan of main patch, and check
the messages in javascript alert are displaying the right way.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9780: restrict the ability to delete a bib record associated with an order
Mathieu Saby [Thu, 19 Sep 2013 12:12:02 +0000 (14:12 +0200)]
Bug 9780: restrict the ability to delete a bib record associated with an order

Currently, anyone can delete a record used in an order.

With this patch, only librarians with managing order permission
can delete it if it is used in an active or a deleted order.

This patch also add a specific warning informing that deleting a record
used in an active order is dangerous.

To test :
A. test what can do and see a librarian with order managing rights
0) Connect to Koha with a borrower with order managing rights
1) in a basket, create 2 orders A & B from new records
2) delete order B
3) in the catalogue, try to delete
- record used for order A : you should see a specific warning
   informing you the record is used in 1 order, and that deleting it
   is dangerous
- record used for order B : you should see a specific warning informing
  you the record is used in 1 deleted order
- a record not used in any order : you should see no specific warning

B. test what can do and see a librarian without order managing rights
4) Connect to Koha with a borrower without order managing rights
5) in a basket, create 2 orders A & B from new records
6) delete order B
7) in the catalogue, try to delete
- record used for order A : you should see a specific warning informing you that
   you need specific rights to delete the record
- record used for order B : idem
- a record not used in any order : you should see no specific warning

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9218: fix intranet cart email for non english templates
Jonathan Druart [Tue, 8 Oct 2013 08:52:28 +0000 (10:52 +0200)]
Bug 9218: fix intranet cart email for non english templates

This patch adapts the method from OPAC to the staff interface (cf bug 8062).

Test plan:
- add somes notices to the cart
- try to send the cart by email
- the email should be the same as before
- translate templates and retry with another language. Before this patch,
  the email was empty. With this patch, it contains the list of records
  and items.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Passes all tests and QA script.
Fixes quite a bad translation problem, tested with German templates
and umlauts in the message and records.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 8307: DBrev 3.13.00.041
Galen Charlton [Thu, 31 Oct 2013 23:40:54 +0000 (23:40 +0000)]
Bug 8307: DBrev 3.13.00.041

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 9044: (follow-up) fix merge conflict typo that broke this script
Galen Charlton [Thu, 31 Oct 2013 23:39:17 +0000 (23:39 +0000)]
Bug 9044: (follow-up) fix merge conflict typo that broke this script

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 8307: QA Followup for finishreceive.pl
Marcel de Rooy [Mon, 3 Jun 2013 08:19:39 +0000 (10:19 +0200)]
Bug 8307: QA Followup for finishreceive.pl

Only split the expression a=b on the first = sign.
Tested with the very unlikely z=x=1 :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
11 years agoBug 8307: Set a value for subfields when receiving
Jonathan Druart [Fri, 18 May 2012 11:42:36 +0000 (13:42 +0200)]
Bug 8307: Set a value for subfields when receiving

If items are created when ordering, this patch allows to add a value for
some items subfields.

Test plan:
Define status for items.notforloan (mapping 995$o in unimarc), for
example 4:On order, 5:On treatment

Set the Syspref AcqCreateItem on "ordering".

ACQ framework : set default value = 4 for 995$o (in unimarc)

Syspref AcqItemSetSubfieldsWhenReceived : set "o=5|b='foo bar'"

When ordering the item, default status will be 4 ; when receiving the
item, status will be changed from 4 to 5. The subfield b have to contain
'foo bar'

Signed-off-by: Frederic Durand <frederic.durand@unilim.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
11 years agoBug 10776: fix awkward wording in subscription notification screen
Liz Rea [Thu, 22 Aug 2013 04:55:48 +0000 (16:55 +1200)]
Bug 10776: fix awkward wording in subscription notification screen

to test:
- make a subscription available to be notified about
- log into the opac, click the subscriptions tab, then More details
- click "Subscribe to email notification on new issues"
- observe the text without the patch - there seems to be an extra "arrive?"
- apply the patch, refresh - wording should flow a bit better.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes bad wording and works as described.
Passes all tests and QA script, template change only.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 11054: Specify UTF-8 encoding when creating a child record
Colin Campbell [Tue, 15 Oct 2013 14:09:08 +0000 (15:09 +0100)]
Bug 11054: Specify UTF-8 encoding when creating a child record

When the only non-ascii characters in a new child record
are latin + diacritic in the range covered by Latin-1 they
are not being added to a new child record correctly encoded.
Explicitly setting the record's encodiing ensures that
they are interpreted correctly.

see "Unicode Bug" in perldoc perlunicode for background on
why these characters are special

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works well. No koha-qa errors.

Same test as before
1) with a record with diacritics in author/title,
2) press new child record, on new record 773adt
with mangled accents
3) Apply patch
4) Repeat 2, now good results

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Tested with a record containing umlauts in the title,
$t was empty before and umlauts in $a mangled.
After applying the patch fields are correctly filled and
diacritics display correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10671: Update patron help files [ FOLLOW-UP ]
Nicole C. Engard [Sat, 26 Oct 2013 03:47:54 +0000 (23:47 -0400)]
Bug 10671: Update patron help files [ FOLLOW-UP ]

This patch adds two new permissions that were just pushed
to the related patron help files. It is a follow up to the
previous patch that updated the patron help file.

To test:

Apply the patron help patch
Apply this patch
Visit the patron permissions page
Confirm that help is there and right

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10671: Update Acq Help Files
Nicole C. Engard [Sat, 26 Oct 2013 01:35:25 +0000 (21:35 -0400)]
Bug 10671: Update Acq Help Files

This patch updates the Acq help file links
to the manual.

To test:

* visit acq pages
* confirm manual links are right

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10671: Update patron help files
Nicole C. Engard [Sat, 26 Oct 2013 01:27:49 +0000 (21:27 -0400)]
Bug 10671: Update patron help files

This patch updates the text and links in the
patron related help files.

To test:

* visit all patron pages
* Click help
* confirm test and links

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
11 years agoBug 10671: Update Admin Help Files
Nicole C. Engard [Sat, 26 Oct 2013 01:04:12 +0000 (21:04 -0400)]
Bug 10671: Update Admin Help Files

This patch updates the links to the manual in the
help files. It also updates the text a bit in a few.

To test:

* Visit admin pages
* Check the help files on each
* Make sure links and text appears

Signed-off-by: Galen Charlton <gmc@esilibrary.com>