]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 7266: flags debarred, suspended, gonenoaddress in overdue
Adrien Saurat [Tue, 20 Dec 2011 08:33:47 +0000 (09:33 +0100)]
Bug 7266: flags debarred, suspended, gonenoaddress in overdue

This patch makes these flags functionnal.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 74984f5cf3f12fe96e6d4201016efd9ca582e8b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7097: HidePatronName not hiding on issue history
Ian Walls [Thu, 5 Jan 2012 18:17:53 +0000 (13:17 -0500)]
Bug 7097: HidePatronName not hiding on issue history

HidePatronName wasn't being respected on a titles Checkout History tab.  This patch
exports the preference to the template (if set), and then toggles the display between
patron cardnumber (if 'on') or the name (if 'off')

To test:

Enable HidePatronName
Go to the Checkout History tab of an item that has been checked out before
You should see the patron's cardnumber instead of their surname, firstname

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5fde4694298b96639b935423f873c133e5cef3ef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7332: Translated title (MARC21 242) not shown
Jared Camins-Esakov [Thu, 8 Dec 2011 14:18:37 +0000 (09:18 -0500)]
Bug 7332: Translated title (MARC21 242) not shown

The cataloger-supplied translated title stored in MARC21 field 242 was not being
displayed when XSLT was enabled.

Test plan:
1) Enable XSLT for OPAC Details and Results, and Intranet Details.
2) Create or add a record with a 242 field
3) See that the translated title is not displayed in OPAC Details or Results, or
Intranet Details
4) Apply patch
5) See that the translated title is now displayed in OPAC Details and Results,
and Intranet Details

Signed-off-by: Duncan Tyler <duncan@duncan-SoT.wgtn.cat-it.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9156de6384cf2ca0a04f2df7697b0c672781166c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6787 - Fast Add framework for NORMARC
Magnus Enger [Tue, 27 Dec 2011 21:49:33 +0000 (22:49 +0100)]
Bug 6787 - Fast Add framework for NORMARC

The new framework will be called "Hurtigkatalogisering".

To test:
- Make sure the nb-NO translation is installed
- Run through the web installer on an empty database
- Select nb-NO as the installation language
- Select NORMARC as the marcflavour
- Include normarc_fastadd_framework in the installed data
- Check that the framework looks ok in:
-- More > Cataloguing
-- More > Administration > MARC framework

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, not problems found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 629f3f322c7f6c21f1808adc9e5af131c1692b9c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7277: Fixes display of subtitles in opac.
Garry Collum [Sun, 15 Jan 2012 22:00:12 +0000 (17:00 -0500)]
Bug 7277: Fixes display of subtitles in opac.

Adds comma and space to results display in opac between title and subtitles.
Also removes extra space before the subtitle in the results display of the staff pac.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0ad771a68b5d60d7592b335934afcec3d7dc6c9e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4300: Fix display of textual holdings (866)
Katrin Fischer [Mon, 16 Jan 2012 22:05:42 +0000 (23:05 +0100)]
Bug 4300: Fix display of textual holdings (866)

Fixed problems:
- only $z, but not $a was shown
- only first $z for each 866 field was shown
- each 866 field produced a ; even if no $z was present

After patch was applied:
- OPAC displays 866 $a and $z, separating each field with ;
- Staff displays 866 $a, $x and $z, separating each field with ;

Example(s) for testing:
866 $a1-86 (1941-1987)$xbound in 2 v. per year$zSome issues missing
866 $a1-86 (1941-1987)
866 $a--86 (1941-1897)$xinternal note
866 $zfirst note,$zsecond note

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7caec5a45fbd5f8d0dcf169870a8d64e63c481e7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7247 - rebuild_zebra.pl -v should show all Zebra log output
Dobrica Pavlinusic [Sat, 19 Nov 2011 10:49:53 +0000 (11:49 +0100)]
Bug 7247 - rebuild_zebra.pl -v should show all Zebra log output

Currently, -v option resets Zebra log output to default system values.

This produce amount of log specified in system defaults which is usually
too low for debugging.

This change explicitly forces all Zebra log output which create much more
chatter so it triggers with verbosity level 2

Test scenario:
1. pick koha site to reindex
2. use -v -v options to rebuild_zebra.pl to see additional output

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified help corrections and  loglevel 2 output vs. loglevel 1 output. No issues found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 90d68d6f5c1c34ed15ac35672ef5e5994a3b39c8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6466 - hung socket read causes SIP tests to fail
JAMES Mason [Mon, 6 Jun 2011 04:10:39 +0000 (16:10 +1200)]
Bug 6466 - hung socket read causes SIP tests to fail

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b0a42333666ff136deb478b8debf5b63f83ed298)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5533 followup: reinstate Lost status editing
Ian Walls [Thu, 15 Dec 2011 13:21:56 +0000 (08:21 -0500)]
Bug 5533 followup: reinstate Lost status editing

The original patch for 5533 removed the Lost status from the edit items screen; new items were not affected,
and batch changes could still be made, so this was not a consistent change.

This patch removes the filter that hid the Lost status dropdown, but then changes the default MARC framework
to hide this field by default (value -5).  New installations will not see this status in the editor, unless
they manually activate it.  This will enforce the semantics of using the "mark lost" options by default, but
provide a workaround for libraries that understand and accept the consequences of manually editing this field.

To test:

1.  on an existing install, edit an item.  you should have the Lost status visible
2.  on a new install, editing or creating an item should not show the Lost status at all

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3062405c0989bfd34422ed6d1118cf8b98a84865)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7407: HidePatronName not working on 'on hold for' messages
Ian Walls [Thu, 5 Jan 2012 19:10:52 +0000 (14:10 -0500)]
Bug 7407: HidePatronName not working on 'on hold for' messages

HidePatronName was not working on 'on hold for' messages, only 'checked out to'
messages.  This resulted in the patrons name showing if the item was on hold for
them.

T:T scope issue; needs to be within itemloo.  This patch does that.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit b08ccda99d23cca5ee9e01bd351cb3605e9201af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug 5327 add tests for C4/BackgroundJob.pm
Sam Sanders [Tue, 17 Jan 2012 02:37:59 +0000 (15:37 +1300)]
bug 5327 add tests for C4/BackgroundJob.pm

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl t/db_dependent/BackgroundJob.t
All tests complete successfully.

Note: Test 11 does not tell what it's about, but it has been there before.
(cherry picked from commit dbb29b4042f3e1785dff1ca5aaa351a6340a8183)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 Added unit tests for C4/Reports.pm
Connor Dewar [Tue, 17 Jan 2012 02:40:25 +0000 (15:40 +1300)]
Bug 5327 Added unit tests for C4/Reports.pm

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl t/Reports.t b/t/Reports.t
All tests complete successfully.
(cherry picked from commit e96c92d077b8fdc4da70781a18c52c2706299254)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 Added unit tests for C4/ClassSortRoutine/Dewey.pm
Connor Dewar [Tue, 17 Jan 2012 01:32:29 +0000 (14:32 +1300)]
Bug 5327 Added unit tests for C4/ClassSortRoutine/Dewey.pm

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f053ca0c22fdc0429fdcb1a7a67fde6171c971a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5327 added unit tests for C4/ClassSortRoutine/Generic
Connor Dewar [Tue, 17 Jan 2012 00:55:03 +0000 (13:55 +1300)]
Bug 5327 added unit tests for C4/ClassSortRoutine/Generic

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 995485e57409ec5ffff32aea33f6dda642d75b87)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6990 follow up PODDOC & unit test updating
Paul Poulain [Mon, 16 Jan 2012 17:47:15 +0000 (18:47 +0100)]
Bug 6990 follow up PODDOC & unit test updating

This patch removes the TransformKohaToMarcOneField sub, but there was some remaining POD & unit test about it
(cherry picked from commit 6456afea959111b3e0cade89e14251ea8abd5f74)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoTransformKohaToMarc enhancement
Frédéric Demians [Sat, 8 Oct 2011 15:03:18 +0000 (17:03 +0200)]
TransformKohaToMarc enhancement

TransformKohaToMarc function is called for each biblio and item that has
to be build. This function execute a DB statement for each Koha field
that has to be mapped to a MARC tag/letter. This impact deeply
performances for script like rebuild_zebra, especially since items are
not anymore in bilio records and have to be rebuild on the fly.

I'm proposing a patch which read Koha field to MARC field mapping just
one time and cache it. My test show a 30% execution time improvement on
rebuild_zebra.pl script. It uses already cached mapping in C4::Context.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
http://bugs.koha-community.org/show_bug.cgi?id=6990
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 02d392a502571e14df9373782343cf5e3bbe83b6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7364: Possible to get to FA item add without current branch being defined.
D Ruth Bavousett [Fri, 16 Dec 2011 15:38:47 +0000 (10:38 -0500)]
Bug 7364: Possible to get to FA item add without current branch being defined.

Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
use it, otherwise, use the user's logged in branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Modified for syntax by:  Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Follow up to allow tests to check plugins too
Chris Cormack [Fri, 13 Jan 2012 18:28:11 +0000 (07:28 +1300)]
Bug 929 : Follow up to allow tests to check plugins too

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
perl xt/author/valid-templates.t runs without errors now.
(cherry picked from commit 2cfb891c83f4e6eab8518c4944c70d751b966cfb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7364: Possible to get to FA item add without current branch being defined.
D Ruth Bavousett [Fri, 16 Dec 2011 15:38:47 +0000 (10:38 -0500)]
Bug 7364: Possible to get to FA item add without current branch being defined.

Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
use it, otherwise, use the user's logged in branch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6f681bec2d71d3d2b88aea5f8e0c15010241d580)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7143: add Albert Oller to the about.tt
Jesse Maseto [Fri, 13 Jan 2012 23:34:00 +0000 (18:34 -0500)]
Bug 7143: add Albert Oller to the about.tt

Albert Oller was in the doc/history.txt but not the About page.
adding him alphabetically

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3907cf454762a44718c9a2b8d8ec6b8733694e2d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6947 : opac-topissues.pl wasn't respecting item live itemtypes
Chris Cormack [Fri, 28 Oct 2011 19:49:20 +0000 (08:49 +1300)]
Bug 6947 : opac-topissues.pl wasn't respecting item live itemtypes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The search was only looking for bib level itypes independent
from the settings for item-level_itypes.

After patch the system preference setting is respected
and search works accordingly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 251d873b82bce4b869d2a6351b832e49e957d2c2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6132: Add unit test for system preferences
Julian Maurice [Mon, 2 Jan 2012 09:49:28 +0000 (10:49 +0100)]
Bug 6132: Add unit test for system preferences

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6eac5284ee584ea21988f9639a0d5b47e701937e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6132: Update sysprefs cache in set_preference
Julian Maurice [Mon, 2 Jan 2012 09:45:55 +0000 (10:45 +0100)]
Bug 6132: Update sysprefs cache in set_preference

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b867d7d12adb98f42b473bc850927e1535a6ab6c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 small follow-up (mistake in POD)
Paul Poulain [Fri, 13 Jan 2012 16:47:16 +0000 (17:47 +0100)]
Bug 929 small follow-up (mistake in POD)
(cherry picked from commit 5dcc27d14caee68a9aa112c7c0db99a0169980b2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Follow up adding unit tests, discovered C4::Dates cached the syspref with...
Chris Cormack [Thu, 12 Jan 2012 08:23:21 +0000 (21:23 +1300)]
Bug 929 : Follow up adding unit tests, discovered C4::Dates cached the syspref with no way to clear it, fixed also.
(cherry picked from commit 55d0b65522d3caa8d7c819b2cfa7ce8f2483c33e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929: Follow up adding the Koha:: namespace to the list of modules to test
Chris Cormack [Thu, 12 Jan 2012 07:16:52 +0000 (20:16 +1300)]
Bug 929: Follow up adding the Koha:: namespace to the list of modules to test
(cherry picked from commit e6bbb97942c42e5e1a2a4f986264e61aa865558f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7240: Cleaning up import tables and action_logs
Marcel de Rooy [Mon, 21 Nov 2011 11:21:11 +0000 (12:21 +0100)]
Bug 7240: Cleaning up import tables and action_logs

This patch lets cleanup_database also purge older records from the (five) import tables and the action_logs table.
Two new command line parameters are introduced: --import and --logs.
If no number of days is specified for --zebraqueue, --import or --logs, it defaults to 30 days, 60 days resp. 180 days.
I did not add a default for --sessdays, because this parameter cannot be seen separately from parameter --sessions.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Adds new parameters and code, does not change existing behaviour

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 73c5cb327723cdba39e52458a4aff824cc540a52)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7396: Debarred message not showing over SIP2
Ian Walls [Mon, 2 Jan 2012 16:06:13 +0000 (11:06 -0500)]
Bug 7396: Debarred message not showing over SIP2

Corrects typo in list of flags; was DEBARRED, but the actual name of the flag is
DBARRED (for some reason)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 000047769f12c55d59e444041ddcc0aaf5613fe4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7381 - wrong isbn showing on the staff search results
Owen Leonard [Tue, 27 Dec 2011 19:46:54 +0000 (14:46 -0500)]
Bug 7381 - wrong isbn showing on the staff search results

Outputting the "raw" ISBN. In the case of multiples, ISBNs
are concatenated with " | " Using a T:T filter to make these
a comma-separated list.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Added a record and confirmed that the right ISBN shows on the
search results and that the amazon cover image still works.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 8deb21a2c02e3d0678c44e37a8501de56228b256)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7363: allows downloading of lists in CSV format
Adrien Saurat [Fri, 16 Dec 2011 15:51:18 +0000 (16:51 +0100)]
Bug 7363: allows downloading of lists in CSV format

Getting a list in CSV format was impossible because the
shelfid parameter was empty in the URL.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 5641b90b63e43f2c4eee026c5dc77f6398232872)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7360 Import Default framework into other deletes default Framework
Admin User Koha [Wed, 14 Dec 2011 16:31:00 +0000 (17:31 +0100)]
Bug 7360 Import Default framework into other deletes default Framework

Step to reproduce :
- export default framework as SQL
- create new framework
- Import the exported SQL file into this new framework.
Go to default framework :
It disappeared.

If some libraries want to share default frameworks, then it is a major bug.
This patch fixes the test in order to cope with 0 character framework name.

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a830f46fc73af2281926e4fc83967674f4025ad3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7356 - Fix various typos and mis-spellings
Marc Balmer [Sun, 11 Dec 2011 18:00:14 +0000 (19:00 +0100)]
Bug 7356 - Fix various typos and mis-spellings

Fix typos: the the -> the, wether -> whether, developper -> developer.

http://bugs.koha-community.org/show_bug.cgi?id=7356
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c9c6bbdea89e60dc6dc5019cdca512ba8eba4a38)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6717 Documenting need_merge_authorities table
Marcel de Rooy [Thu, 20 Oct 2011 07:25:23 +0000 (09:25 +0200)]
6717 Documenting need_merge_authorities table

Documentation only.

http://bugs.koha-community.org/show_bug.cgi?id=6716
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit d471a79e92126d4d70b70e41013fe366ffbcba6e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug6716 - document the aqbooksellers table
Nicole C. Engard [Wed, 28 Sep 2011 12:05:29 +0000 (08:05 -0400)]
bug6716 - document the aqbooksellers table

This documents the table that stores vendor info in Koha.

There were 4 unused fields found:
  `accountnumber`
  `othersupplier`
  `currency`
  `booksellerurl`

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Accountnumber is no longer unused and can be managed.
(cherry picked from commit 378df7aea521435d63b35f6b6c7f8e166d6ff24f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7348 - Fixed error for serial toolbar buttons in IE7
Duncan Tyler [Tue, 13 Dec 2011 03:42:17 +0000 (16:42 +1300)]
Bug 7348 - Fixed error for serial toolbar buttons in IE7

http://bugs.koha-community.org/show_bug.cgi?id=7348
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9faf50a66c842582a4bf74104328095bd607449d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7375 - Update minimum version of Perl to 5.10
Magnus Enger [Thu, 22 Dec 2011 09:20:44 +0000 (10:20 +0100)]
Bug 7375 - Update minimum version of Perl to 5.10

- Change the installer script to look for at least 5.10/5.010000
- Change the template to ask for the correct version

To test:
- Run through the webinstaller on 5.10 or newer and check that there are
no errors.
- Ideally: Run through the webinstaller on an older version than 5.10 and
check that there *is* an error, asking for 5.10 or newer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1c04a9840028d65258410f1155a504ffae69fc99)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7079: [SIGNED-OFF] Default values for German system preferences
Katrin Fischer [Mon, 24 Oct 2011 12:57:52 +0000 (14:57 +0200)]
Bug 7079: [SIGNED-OFF] Default values for German system preferences

Patch adds updates for system preferences to the sql file
in the installer directory:

- New: AmazonLocale: DE
- borrowerRelationship: Vater|Mutter
- BorrowersTitles: Herr|Frau
- New: CurrencyFormat: FR
- New: dateformat: metric
- New: DefaultClassificationSource: z
- New: OpacMainUserBlock: translated content
- New: OpacNav: translated content
- New: OpacNavBottom: translated content
- New: OPACSearchForTitleIn: translated content

To test:
A) Do a full installation with German sample files
B) Run the sql file 'system_preferences.sql' against your database

Verfy values of system preferences have been changed.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch applied cleanly. I ran through the webinstaller in German on an empty
database, and made sure system_preferences were loaded. No complaints from
the database and the systprefs are set to the right values when I check in the
staff client.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c1d824deaa65f0a64071e6925ae2238beb0a0912)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 6015 : Improving load_testing"
Paul Poulain [Wed, 9 Nov 2011 16:29:17 +0000 (17:29 +0100)]
Revert "Bug 6015 : Improving load_testing"

sorry, was not supposed to be pushed (follow-up needed)

This reverts commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc.
(cherry picked from commit 93e597b5ea5fc23c737c6e0e8bb42f763e3125d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6015 : Improving load_testing
Henri-Damien LAURENT [Thu, 25 Mar 2010 10:37:19 +0000 (11:37 +0100)]
Bug 6015 : Improving load_testing

Adding a benchmark for OPAC
it tests :
 - mainpage
 - search page
 - detail page

Staff :
Adding a test on member searches
(cherry picked from commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7373 - Add 5 new icons to Bridge Set
Nicole C. Engard [Fri, 16 Dec 2011 11:17:09 +0000 (06:17 -0500)]
Bug 7373 - Add 5 new icons to Bridge Set

This patch adds 5 new icons to the Bridge Set.
These icons are designed by the Erikson Institute
in Chicago, IL, USA.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3340456f296d9e0fcdbfb164f6e4b505698b4842)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7368: Correct spelling of merge authorities job in pref file.
Marcel de Rooy [Mon, 19 Dec 2011 12:46:31 +0000 (13:46 +0100)]
Bug 7368: Correct spelling of merge authorities job in pref file.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6768c724404e2e6335b86d1025b5b84d6ed00052)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7367: Add space before display of languages.
Marcel de Rooy [Mon, 19 Dec 2011 12:25:42 +0000 (13:25 +0100)]
Bug 7367: Add space before display of languages.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am a bit confused why it does not work without the &nbsp;
but patch fixes the display problem.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 30dfb7d0a3376e412fbcb58c0080ff288fc1563b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5226: Add 545 to es-ES and nb-NO
Jared Camins-Esakov [Mon, 9 Jan 2012 14:31:07 +0000 (09:31 -0500)]
Bug 5226: Add 545 to es-ES and nb-NO

Since the original patches for bug 5226 were submitted, two new translations
have been added to Koha: es-ES and nb-NO. This patch adds the missing 545 line
to the frameworks for those languages.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c696bbec658016cc6ef2aeb67d4d50226ff9a854)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5226: Follow up to new/awaiting_qa/bug_5226
Katrin Fischer [Mon, 6 Dec 2010 17:39:38 +0000 (18:39 +0100)]
Bug 5226: Follow up to new/awaiting_qa/bug_5226

This patch adds the field definition to
- it-IT (default and sample frameworks)
- de-DE, en, fr-FR, pl-PL (sample frameworks)

I am not sure about the database update. If we want to do that, it should perhaps update all frameworks and languages.
At the moment only en and de-DE default frameworks are updated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 442eb72be5bacef4fa263268252d5f0d9e3d938a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdd MARC21 field 545 to to framework fix bug 5226
Jared Camins-Esakov [Tue, 2 Nov 2010 03:08:24 +0000 (23:08 -0400)]
Add MARC21 field 545 to to framework fix bug 5226

Adds MARC21 field 545 to the English, French, German, and Polish MARC21
frameworks. The labels for the field still need to be translated into
French and Polish.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Backporting to 3.6.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6098 Followup -- doesn't replace NSB/NSE by space
Frédéric Demians [Fri, 13 May 2011 13:24:39 +0000 (15:24 +0200)]
Bug 6098 Followup -- doesn't replace NSB/NSE by space

On any page, NSB/NSE characters are replaced by space in Output.pm. It isn't a
good thing:

  - It isn't necessary since Zebra indexer handle properly those characters as
    delimiter.
  - It isn't necessary for display since XSL file already do that.
  - It isn't efficient since a regex is done on every whole page sent by Koha,
    not only on biblio record part.
  - It removes an information that librarian want to keep in their biblio
    records: any record edited in Koha loose its NSB/NSE characters.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d785d9d57dad2d529b1dd243c6ce3c4ddce3bc80)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBUG 6098 zebra conf NSB NSE indexed as space
Fridolyn SOMERS [Wed, 6 Apr 2011 15:44:52 +0000 (17:44 +0200)]
BUG 6098 zebra conf NSB NSE indexed as space

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1f0bad091b3e16f278ae14a12ca1a93525ccdfff)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2629 - Diacritics not being ignored when searching
Albert Oller [Wed, 30 Nov 2011 00:16:51 +0000 (19:16 -0500)]
Bug 2629 - Diacritics not being ignored when searching

/etc/zebradb/etc/word-phrase-utf.chr
added Cc miniscule and Cc circumflex; added Kk acute accent.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
- imported marc record from the bug with the offending diacritic
- reindexed
- searched for the title - result found! Yay!
(cherry picked from commit 35bc73eca324c371982747f2f0454a71a4f46245)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7278 follow-up DBrev number
Paul Poulain [Tue, 10 Jan 2012 22:00:04 +0000 (23:00 +0100)]
Bug 7278 follow-up DBrev number

Backporting to 3.6.x

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7278: Follow up fixing display of item informaton on detail page
Katrin Fischer [Tue, 20 Dec 2011 07:40:03 +0000 (08:40 +0100)]
Bug 7278: Follow up fixing display of item informaton on detail page

Fixes a display problem in the item table on staff detail page.

To test:
Add a record with 3 items:
- 1 with copynumber
- 1 with materials specified
- 1 with opac notes

Before patch the table will be broken a bit and the headings
don't match the contents (wrong sequence).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 52098370f51994b4f89f2e2a0dda03a9700aa26f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7278 : Additional Materials
Chris Cormack [Thu, 1 Dec 2011 01:19:44 +0000 (14:19 +1300)]
Bug 7278 : Additional Materials

Part 2: This patch shows the message at checkout and checkin

How to test:
* Add a note in cataloguing
* Check it displays at checkout and checkin
* Check items without a note don't display anything

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit a9e080a6fbcdd268a03f82138453bb22224f351b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7728 : Materials Specified field made larger and displayed
Chris Cormack [Wed, 30 Nov 2011 21:46:52 +0000 (10:46 +1300)]
Bug 7728 : Materials Specified field made larger and displayed

This first page makes the database change, and displays the field on
the detail.pl and moredetail.pl pages in the staff client

How to Test:

* Add a note to the materials specified page in cataloguing (952
subfield 3 for MARC21, but it shouldn't matter as long as you have a
field mapped to items.materials
* Check it displays at catalogue/detail.pl
* Check it displays at catalogue/moredetail.pl

Patch to follow to have the note display at checkin/checkout

http://bugs.koha-community.org/show_bug.cgi?id=7278

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts in updatedatabase.pl and kohastructure.sql
(cherry picked from commit 67c6c95396fcaeca49da68499b0ceb5b6350b4b8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6374: default value for Size in result pages
Adrien Saurat [Tue, 3 Jan 2012 14:28:50 +0000 (15:28 +0100)]
Bug 6374: default value for Size in result pages

When no size info is available, an empty string is
sent to the TT (if nothing is sent, the TT engine
will display another information, irrelevant for Koha).

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Works beautifully!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 74506e52deb383589b541848bbb2026aa4991f81)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3651 Follow-up, Require patron login to send shelves and baskets
Owen Leonard [Thu, 29 Dec 2011 16:47:44 +0000 (11:47 -0500)]
Bug 3651 Follow-up, Require patron login to send shelves and baskets

The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
search-bar and force authentication on all OPAC pages" incorrectly
made some page permissions dependent on the value of the OpacPublic
setting. Some pages should require authentication no matter what.

This patch returns opac-sendbasket.pl to the state it was in before
Bug 4289, Bug 4274 notwithstanding. I have added the authentication
requirement to opac-sendshelf.pl to match.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) sending cart requires login
2) sending shelf requires login
3) updating personal details requires login

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 9e70695907d97953e097087425ccaaefd3809897)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Chris Hall [Thu, 22 Dec 2011 02:43:08 +0000 (15:43 +1300)]
Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit c2837b39a4dede60e6d65e01fdaa02c835067e70)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity
Owen Leonard [Tue, 8 Nov 2011 16:43:38 +0000 (11:43 -0500)]
Fix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity

- Adding html filter to subtitle output to correct unescaped ampersands
- Adding missing alt attributes to libravatar output
- Removing unecessary markup  from comments page

Bonus: Adding html_break filter to output of comments to preserve line breaks
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fe9312a1240e58a04b0cd0c322d46c34a4b51891)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix to make date obviously editable - bug 7193
Duncan Tyler [Mon, 19 Dec 2011 00:43:21 +0000 (13:43 +1300)]
Fix to make date obviously editable - bug 7193

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes all date fields on subscription entry to be
obvious input fields. This makes it more obvious that you
can enter dates manually and is more consistent with how
we handle dates in other places.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0d9309e52020d42d4a75e944b7031c886d1be7ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system...
Duncan Tyler [Thu, 22 Dec 2011 01:32:22 +0000 (14:32 +1300)]
Bug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system preferences search results - bug 7341

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4f16da0d310c84b6a2fb98adc160a56bb18a0ac0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7338: Follow up: show link only when there is more than 1 subscription
Katrin Fischer [Mon, 12 Dec 2011 07:39:39 +0000 (08:39 +0100)]
Bug 7338: Follow up: show link only when there is more than 1 subscription

To be tested together with
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690

1) Create a subscription for a title
- check the link 'Show any subscription...' doesn't show now
- check the serials collection page works correctly and shows all
necessary information

2) Create a second subscription for the same title
- check a new link 'Show any subscription...' shows up now
- use links in the issue table to change between viewing the single subscription
and the overview page
- check it works correctly and all information shows up

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works. With this patch, on Serials Collection page, the link, 'See any
subscription attached to this biblio' appears only when there are more than one
subscription attached to the biblio record.
(cherry picked from commit 42265ef21758acd6e44eca3a48ab57529628717c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7338 Links on Serial Collection page
Frédéric Demians [Fri, 9 Dec 2011 07:32:01 +0000 (08:32 +0100)]
Bug 7338 Links on Serial Collection page

Don't display link to the serial, when the collection page displays just
one subscription. Display it when several subscriptions. Alway display a
link for displaying biblio record other subscriptions.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely, but always shows link to 'any subscriptions'.
I did a follow-up so the link would only show if there was more
than 1 subscription for the record.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 33587674fa85fabfb6183b37bb8c2733ec2b6d6a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Bug 5729 - Add CoinS to intranet"
Chris Nighswonger [Wed, 18 Jan 2012 14:08:46 +0000 (09:08 -0500)]
Revert "Bug 5729 - Add CoinS to intranet"

This reverts commit b05389689590fe1c135b3a6762b899df493a836d.

Removing this enh from 3.6.x

12 years agoRelease Notes for 3.06.03.000 17 Jan 2012 19:39:50 Z
Chris Nighswonger [Tue, 17 Jan 2012 19:39:50 +0000 (14:39 -0500)]
Release Notes for 3.06.03.000 17 Jan 2012 19:39:50 Z

12 years agoRelease Notes for 3.06.03.000 17 Jan 2012 12:46:33 Z
Chris Nighswonger [Tue, 17 Jan 2012 12:46:33 +0000 (07:46 -0500)]
Release Notes for 3.06.03.000 17 Jan 2012 12:46:33 Z

12 years agoBug 6147 : Correcting invalid RSS
Christophe Croullebois [Mon, 16 May 2011 22:16:07 +0000 (10:16 +1200)]
Bug 6147 : Correcting invalid RSS

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Feed validates using http://feed1.w3.org/ with the following recommendations:

This feed is valid, but interoperability with the widest range of feed readers could be improved by implementing the following recommendations.
line 12, column 149: Relative href value on self link: /cgi-bin/koha/opac-search.pl?idx=kw&q=some&sort_by=acqdate_dsc&format=rss2 [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 12, column 149: Self reference doesn't match document location [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 20, column 158: Unregistered link relationship: search (10 occurrences) [help]
... _by=&amp;format=opensearchdescription"/>
                                             ^
line 40, column 9: description should not contain relative URL references: /cgi-bin/koha/opac-reserve.pl?biblionumber=10 (10 occurrences) [help]
]]></description>
         ^
line 22, column 5: Misplaced Item (9 occurrences) [help]
     <item>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit a0a57b9526c244771aac57ad3ac3dee5dec1a16e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6627 follow-up
Paul Poulain [Fri, 6 Jan 2012 13:22:59 +0000 (14:22 +0100)]
Bug 6627 follow-up

in installer, some lines where forgotten, and can also be commented
(cherry picked from commit a60101bea074fdd81434c8f047ed7d3a0de8ebce)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Duncan Tyler [Wed, 21 Dec 2011 01:59:21 +0000 (14:59 +1300)]
Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 00290e86197bbd0129a4fc943a957f823235210d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: Follow up fixing quotes
Katrin Fischer [Thu, 5 Jan 2012 07:09:03 +0000 (08:09 +0100)]
Bug 5369: Follow up fixing quotes

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Confirm that this works. My only remark would be that &quot; could have been used.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6d2ca576e25242015711c33ac114e87db9757639)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: Make series tracings use phrase indexes
Jared Camins-Esakov [Fri, 2 Dec 2011 00:35:43 +0000 (19:35 -0500)]
Bug 5369: Make series tracings use phrase indexes

By definition, series tracings should search for other records in the same
series, i.e., those with the exact same series title. This patch forces the
tracings to use phrase indexes for series tracings.

Note that this patch DOES NOT respect TraceCompleteSubfields. While that may be
desirable, it is outside the scope of the current patch. An additional follow-up
patch could be written to add support for TraceCompleteSubfields, if community
concensus is that series tracings should obey TraceCompleteSubfields.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow up and sign off Jared :)
(cherry picked from commit 9b3e1552c4cfb41f1d85b346515f15450760d7bf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5369: se queries with paranthesis fail
Katrin Fischer [Mon, 28 Nov 2011 06:25:37 +0000 (07:25 +0100)]
Bug 5369: se queries with paranthesis fail

This patch does several things to make the search work better:

1) Adding "" around search terms for queries on index se.
2) Make links for 8xx obey the UseControlNumber system preference
3) Fix the indexing for 8xx fields, as they were not included in the se index before

Note: Make sure you copy the new record.abs into your koha-dev directory and reindex
before testing.

To test:
1) Add records using the following fields:
440$a
490$a ind. 1 = empty or 0
490$a ind. 1 = 1
800$a, 810$a, 811$a or 830$a

Example value taken form bug description, should only work after applying the patch:
DHEW publication no. (HSM) 73-1804

Please also test with other examples.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 4cd81a8d0f2eeccc71d2b1409f35c8ee57314b8a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929: Follow up - showing fund code instead of internal number
Katrin Fischer [Thu, 29 Dec 2011 09:51:15 +0000 (10:51 +0100)]
Bug 929: Follow up - showing fund code instead of internal number

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 71d2d81e346846f455e2f673d8983ffd9d00310e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Followup fixing date formatting
Chris Cormack [Thu, 29 Dec 2011 08:46:51 +0000 (21:46 +1300)]
Bug 929 : Followup fixing date formatting

This patch introduces a Filter (KohaDates) for use in templates
[% USE KohaDates %]
[% somevariable | $KohaDates %]

This will format the date in the format specified by the systempreference

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 01875b565d7c04b3b00ba1986f824cae7d1fb2a9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Last follow up, implementing the last of Katrins suggestions
Chris Cormack [Wed, 28 Dec 2011 20:08:40 +0000 (09:08 +1300)]
Bug 929 : Last follow up, implementing the last of Katrins suggestions

Date formatting
Links
Nomenclature changes

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit ddb6883b578830c75a4d73ca84d630998f89ee6c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Follow up, making some improvements to the spent page More to come
Chris Cormack [Wed, 28 Dec 2011 02:43:47 +0000 (15:43 +1300)]
Bug 929 : Follow up, making some improvements to the spent page More to come

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit c64322e48de53ed64d65f8c86160848a492ea792)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 929 : Reinstating the breakdown of budgets
Chris Cormack [Tue, 27 Dec 2011 20:47:56 +0000 (09:47 +1300)]
Bug 929 : Reinstating the breakdown of budgets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 9638053a25a89040c21a38196dc6c4bb09e6010a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3184: Show creator and budget on order receive page
Katrin Fischer [Fri, 28 Oct 2011 13:54:53 +0000 (15:54 +0200)]
Bug 3184: Show creator and budget on order receive page

Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>

To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly

Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"

Signed-off-by: Duncan Tyler <duncan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 37e1f05e8f8617883c02ff1b57f36a4fff3a39ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for...
Chris Cormack [Tue, 3 Jan 2012 06:57:41 +0000 (19:57 +1300)]
Bug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for 404 inestead of doing unnessecary processing

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I can confirm the bug and the solution.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Second sign-off from me, patch fixes display of detail page
for last record on a result page.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit fa1a90fd4f6fcb709bc2bd6ad57e75154ecb63f9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7328 Expanded options in advanced search
Frédéric Demians [Wed, 7 Dec 2011 07:46:21 +0000 (08:46 +0100)]
Bug 7328 Expanded options in advanced search

In OPAC and intra advanced search, more search options are displayed
depending on expandedSearchOption syspres and user choice. This doesn't
work anymore in HEAD.

This patch restore this functionnality.

To test:

  - enable/disable expandedSearchOption.
  - Load advanced search page. Limited seach options version is always
    displayed
  - Apply this patch and see how it works...

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
The problem only appeared in the staff client for me.
Tested both OPAC and staff with patch applied.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1730e180cdbe11a7878ddfab54cec7291d12f430)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N....
Liz Rea [Thu, 15 Dec 2011 16:21:36 +0000 (10:21 -0600)]
Bug 7333 - Fixing up db_dependent/Search.t to use sample data Thanks to Chris N. for helping figure out that it was because there were no French stopwords in the DB that the test was failing.

Patch changes the French string (with French stopwords) to an English string with English stopwords, as only English stopwords are installed in the default data.

This patch will allow Search.t to run on the database attached to this bug.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 3c12d5f2f63ac06ac8f71c1a5598bc01c82e5802)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT
Alex Arnaud [Fri, 8 Apr 2011 12:02:19 +0000 (14:02 +0200)]
Bug #6142 - Delete sub CanBookBeReserved and delete function's reference on @EXPORT

Original-Author:    Alex Arnaud <alex.arnaud@biblibre.com>, Stéphane Delaune <stephane.delaune@biblibre.com>
Original-Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Correct use statement bug found by Ian Walls

Backporting to 3.6.x

Author: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5729 - Add CoinS to intranet
Paul Poulain [Tue, 27 Sep 2011 16:35:33 +0000 (18:35 +0200)]
Bug 5729 - Add CoinS to intranet

This patch adds CoinS support to biblio displays in staff interface.
librarians can now use zotero on the staff interface

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Modified by: Ian Walls <ian.walls@bywatersolutions.com>

GetCOinSBiblio has changed interface, requiring a $record object instead
of looking one up by biblionumber.  Calls in ISBDdetail.pl, MARCdetail.pl
and detail.pl updated.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit c96a52a4a0eeda52b219ba29a86685337265ab56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBUG 5607 : Adds parsing of issues fields in overdue letters
Sophie Meynieux [Mon, 19 Dec 2011 11:31:21 +0000 (12:31 +0100)]
BUG 5607 : Adds parsing of issues fields in overdue letters

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch makes it possible to add fields from the issues table to overdue notices.

Template used for testing:
<item>"<<biblio.title>>" by <<biblio.author>>, <<items.itemcallnumber>>, Barcode: <<items.barcode>> , Checkout date: <<issues.issuedate>>, Due date: <<issues.date_due>> Fine: <fine>GBP</fine> Checkout date from items: <<items.onloan>></item>

Possible improvements:
- Dates are not formatted according to dateformat system preference

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 940652a6c7ac45b255d4d9b89bf90ccfca568ccd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5565 UNIMARC to DC XSL tidy up
Frédéric Demians [Fri, 31 Dec 2010 06:35:29 +0000 (07:35 +0100)]
Bug 5565 UNIMARC to DC XSL tidy up

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 34e99cf478010e886ea75ccad6d8026ca547fe03)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks
Frédéric Demians [Fri, 31 Dec 2010 06:32:41 +0000 (07:32 +0100)]
Bug 5565 Default OAI UNIMARC to Dublin Core XSL adds superfluous blanks

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6eb50747575acec333a76ff08fa04cc9a85656d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 1623 - Provide view of approved comments
Owen Leonard [Mon, 28 Nov 2011 13:35:21 +0000 (08:35 -0500)]
Bug 1623 - Provide view of approved comments

This patch creates two tabs on the comments administration page:
one for approved comments and one for unapproved comments. Each
display is paginated according to the numSearchResults preference.
The list of approved comments has, instead of a link to approve,
a link to unapprove.

The JavaScript table sorter has been removed since it doesn't make
sense to sort individual pages of a multi-page result set.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bc2a1d18e246b024e93a88df140281eebeb53a48)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7370 : Missing use call
Chris Cormack [Wed, 21 Dec 2011 19:27:09 +0000 (08:27 +1300)]
Bug 7370 : Missing use call

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 525c7bc4af45b548e548c2fe6f69c4d22ec1d472)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7311: Only run analytics code if analytics are enabled
Jared Camins-Esakov [Fri, 2 Dec 2011 14:24:42 +0000 (15:24 +0100)]
Bug 7311: Only run analytics code if analytics are enabled

With the addition of the code from Bug 5528 (easy analytic record workflows),
UNIMARC 461$0 and MARC21/NORMARC 773$0 have special meanings. When you import
a record that uses those subfields for different data, you will get an error
in /cataloguing/additem.pl. A check should be added to be sure that
EasyAnalyticalRecords is enabled before trying to handle the 461$0/773$0 as
bib numbers for analytics.

Thanks to Frère Sébastien Marie for spotting this issue.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 97caccbd0fea3245e3f1c701de7ba2a4e46726d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoUse MARCAuthorityControlField008 in AddAuthority for empty 008s
Frédérick Capovilla [Thu, 20 Oct 2011 16:05:02 +0000 (12:05 -0400)]
Use MARCAuthorityControlField008 in AddAuthority for empty 008s

The old default value for field 008 didn't have the correct length,
which could potentially cause data corruptions.

Uses the MARCAuthorityControlField008 preference added by BUG4839.

http://bugs.koha-community.org/show_bug.cgi?id=7072
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6408547cc0d396c8b9d29e1f7617637d9c12a9a6)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoTest to check for XXX in kohaversion.pl or updatedatabase.pl
Chris Cormack [Mon, 8 Aug 2011 21:45:00 +0000 (23:45 +0200)]
Test to check for XXX in kohaversion.pl or updatedatabase.pl

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended the original patch of Chris to add two exceptions for a line in SetVersion and TransferToNum.

http://bugs.koha-community.org/show_bug.cgi?id=6700
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit bb92ac1ee01a9b781ca2a7adab4beec28e6edeaa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6700: Better handling of version numbers in updatedatabase
Marcel de Rooy [Thu, 30 Jun 2011 07:34:23 +0000 (09:34 +0200)]
6700: Better handling of version numbers in updatedatabase

Contains a few lines of code for updatedatabase routines SetVersion and TransformToNum in order to facilitate testing new db revisions which are still marked XXX.
Currently, the XXX as added in a proposed patch generates an error in the version compare. Additionally, running SetVersion while testing the upgrade is annoying and not needed. In testing stage you would like to keep your version number as is. The version number should of course be incremented when the patch is pushed. A simple test accomplishes that.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c8982e1ab41ef54ba66afd3ed313e81cde307004)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6193 - Use memcached cache koha-conf.xml configuration variables
Tomas Cohen Arazi [Thu, 14 Apr 2011 17:40:21 +0000 (14:40 -0300)]
Bug 6193 - Use memcached cache koha-conf.xml configuration variables

Basically I add some code to Context.pm so it stores koha-conf.xml config vars
in memcached server. It is arguable whether this is an improvement or not,
tests are needed to conclude something about this.

Error handling was an issue with Cache::Memcached, I tried to do it the
simplest I could.

Note: As it was pointless to read the xml file to get the memcached
server info for accessing them for retreiving the info in the koha-conf.xml
file... I passed those values through apache's SetEnv. These variables
are set acordingly through the install scripts and commented out if koha
was setup not to use it.

Bug 6193 - Properly comment the code

Required by slef.

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: MJ Ray <mjr@phonecoop.coop>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 22dca58cbad64841fb12a6e48afa50500c1a5c60)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6880- Reason for suggestions do not save
Owen Leonard [Wed, 26 Oct 2011 18:17:52 +0000 (14:17 -0400)]
Bug 6880- Reason for suggestions do not save

The fix for Bug 1883 seems to have lacked the necessary
update to the database to add the "patronreason" column
to the suggestions table. This patch does so.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch adds database update and change to kohastructure.
After this patch is applied, the patron's reason for
making a suggestion (form in opac) is saved to the database
correctly. The reason is also shown in the detail view
of the suggestion.

Backporting to 3.6.x

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch
Owen Leonard [Tue, 23 Aug 2011 19:33:34 +0000 (15:33 -0400)]
Fix for Bug 3431 - Catalog by itemtype report pulling from holdingbranch

Plus several other fixes for this report no one uses:

- Clarifying titles and breadcrumbs
- Correcting terminology: branch -> library
- Sorting library select field by library name
- Displaying library name instead of code on output
- Sorting results by itemtype description
- Adding tablesorter to results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 396efb90c73099e1f87a5a4593b4c5c1020c69c3)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2307 - Calendar widget cannot be translated
Owen Leonard [Tue, 6 Dec 2011 16:09:46 +0000 (11:09 -0500)]
Bug 2307 - Calendar widget cannot be translated

Implementing the same fix in the OPAC which we now
use in the staff client.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 873ac768b0d557315e3e6067032db78defa4377a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7226 - can't add tags on list
Owen Leonard [Tue, 6 Dec 2011 14:53:05 +0000 (09:53 -0500)]
Bug 7226 - can't add tags on list

Incorrect check for TagsInputOnList was preventing the
right JavaScript from being triggered, and markup was
nested inside the wrong logic for the confirmation
message to be displayed consistently.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0b9d4902def55a6ce7c9b0c006a6210b3f7abe97)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6302 follow up
Marcel de Rooy [Wed, 14 Dec 2011 14:54:22 +0000 (15:54 +0100)]
6302 follow up

Updates to_address in message queue when sending an email (when needed).

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 2ab11c4892f87c054df02763804e34f070d931e1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser
Katrin Fischer [Fri, 2 Dec 2011 06:53:18 +0000 (07:53 +0100)]
Bug 6302: Separate AutoEmailPrimaryAdress and AutoEmailOpacUser

AutoEmailPrimaryAddress is not only used for the patron account mails, but
also for overdues and other email notices to patrons.

This patch separates the system preferences in the system preference editor.

To test:
- Check Patrons tab shows both system preferences separated
- Check you can still change the settings

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
(cherry picked from commit a5a8d78f0d54acd7606477774d5e94cfcac66e9a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Followup 2. several letters where generated if a borrower had overdues...
Sophie Meynieux [Tue, 30 Aug 2011 14:54:42 +0000 (16:54 +0200)]
Bug 6292 : Followup 2. several letters where generated if a borrower had overdues with different due_date triggering the same level

This patch fixes the SQL request giving the list of borrowers

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 1be4678a57200ba895b73e3b3d38f331a9b8cbb4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 : Overdue notices not being generated when borrower had an overdue older...
Chris Cormack [Tue, 3 May 2011 00:13:28 +0000 (12:13 +1200)]
Bug 6292 : Overdue notices not being generated when borrower had an overdue older than the max value of the notice triggers

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit 410975a7f777123d255854ecf3d31541b86ff848)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6292 followup
Sophie Meynieux [Fri, 12 Aug 2011 14:04:13 +0000 (16:04 +0200)]
Bug 6292 followup

selection of items to be listed in an overdue notice included
both limits (upper and lower). So items with an overdue equal
to a limit appeared on both notices. This patch fix this,
including lower limit and excluding upper limit for the selection.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
(cherry picked from commit d86d62adba7f898db26dc58e909f2b91db3248b0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agobug_2830: Remove reserve when checking out if the borrower is not the first one in...
Srdjan Jankovic [Thu, 13 Oct 2011 03:57:41 +0000 (16:57 +1300)]
bug_2830: Remove reserve when checking out if the borrower is not the first one in the reserve queue

To test:
Create 4 holds on a bib, for patrons A, B, C, and D,

Check in the item to mark hold as waiting for patron A
Check out the item to patron B -> reserve for patron B should be removed
Check in the item to mark hold as waiting for patron A
Check out the item to Patron A, hold should complete normally
Check in the item to mark hold as waiting for patron C
Check out the item to patron D -> reserve for patron D should be removed.
Check in the item to mark hold as waiting for patron C
Check out the item to patron C, hold should complete normally
Check in the item -> there should be no more reserves.

We also tested:
Created 4 holds on a bib with two items, for patrons A, B, C, and D

All worked as expected.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 6e07fd7b004b5cb16ea0bec764993c1e9ffe153c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>