]> git.koha-community.org Git - koha.git/log
koha.git
12 years agoBug 6022: Auth_with_ldap check if categorycode is valid
Dobrica Pavlinusic [Thu, 31 Mar 2011 13:14:46 +0000 (15:14 +0200)]
Bug 6022: Auth_with_ldap check if categorycode is valid

When importing users from LDAP, Auth_with_ldap.pm doesn't check if value for
categorycode is present in categories table in Koha resulting in referential
integrity error instead of using default value from koha-conf.xml

Test scenario:
1. enable LDAP in koha-conf.xml using <useldapserver>1</useldapserver>
   and add <ldapserver> configuration with
   <categorycode is="SomeLDAPField">DefaultCategoryCode</categorycode>
2. select/create LDAP user with category in SomeLDAPField which isn't in
   Koha
3. try logging in and ensure that assigned category to new user is
   DefaultCategoryCode

Signed-off-by: Marijana Glavica <mglavica@ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0352a8f24ac72b7dfbf84ea3c6f11e2e714708b0)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6530: Item Due notice label displaying as 'unknown'
Katrin Fischer [Sun, 20 Nov 2011 21:31:47 +0000 (22:31 +0100)]
Bug 6530: Item Due notice label displaying as 'unknown'

Some of the translated sql files still had 'Item_DUE' instead
of 'Item_Due' causing the staff interface to display 'unknown'
instead of the correct description.

To test:
- Do a new installation, using German, French, Polish, Russian or Ukrainian sample files.
- Actived EnhancedMessagingPreferences
- Create a new patron category and check message descriptions display correctly

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7225 - "Delete all items" should be greyed out when a title has no items
Owen Leonard [Tue, 15 Nov 2011 17:01:19 +0000 (12:01 -0500)]
Bug 7225 - "Delete all items" should be greyed out when a title has no items

This patch changes the catalog toolbar so that when there are no
items attached to a record the "Delete all items" menu item appears
to be disabled. Clicking it will trigger an alert, "This record
has no items."

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2346 follow-up (UpdateBorrowerDebarred subroutine removed)
Paul Poulain [Tue, 6 Dec 2011 18:13:55 +0000 (19:13 +0100)]
Bug 2346 follow-up (UpdateBorrowerDebarred subroutine removed)

notifyMailsOp.pl is deprecated : is was written by and for Ouest Provence (thus the OP) and is not used anymore.

it's probably not working anymore.
Removing the script
(cherry picked from commit 00894ac49544625b83fab7cb242bc3160429b938)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7216 - koha-restore does not correctly set home
Jared Camins-Esakov [Sat, 12 Nov 2011 00:53:14 +0000 (19:53 -0500)]
Bug 7216 - koha-restore does not correctly set home

Prior to this patch, the koha-restore Debian script did not set the home
directory properly for the system users it created, causing problems down the
line for koha-rebuild-zebra. This patch fixes that by specifying the home
directory.

http://bugs.koha-community.org/show_bug.cgi?id=7216
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(cherry picked from commit 93cd5bd501c9f9d19261bdb5ef429961d56330af)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7280 - can't place hold without selecting on list
Owen Leonard [Wed, 30 Nov 2011 17:50:35 +0000 (12:50 -0500)]
Bug 7280 - can't place hold without selecting on list

JavaScript was looking for clicks on links with class "hold,"
and incorrectly triggering the check for checked checkboxes.
Making the selection stricter lets the JS function as it should
while allowing people to place individual holds directly.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6740: can add items at ordering/receiving but not remove
Katrin Fischer [Mon, 5 Dec 2011 06:18:21 +0000 (07:18 +0100)]
Bug 6740: can add items at ordering/receiving but not remove

The problem was, that the script was looking for the first
and second <a> tag in the code. When using plugins in the framework
this can't work. The patch changes the script to select the correct
<a> tags by using a class.

Also changes + and - to 'Add' and 'Delete' to make the meaning clearer
and clicking on them a bit easier.

To test:
1) AcqCreateItem = order
- Create a basket
- Create an order line
- Create more than one item
- Delete items
- Check quantity is calculated correctly
- Check items are created correctly

2) AcqCreateItem = receive
- Create basket
- Create 2 order lines, order >1 items
- Do a partial item by removing items from the receive form
- Receive all missing items
- Receive more items than ordered

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation
Frédérick Capovilla [Mon, 21 Nov 2011 17:28:25 +0000 (12:28 -0500)]
Bug 7251 : Corrects a problem in overdue_notices.pl when delimiter is set to tabulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that others values for the separator are OK = it is (space, semicolon,... see syspref "delimiter")
(cherry picked from commit 478c2b139ceb58bc619e7c8a5270e499c870dbcf)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.06.02.000 06 Dec 2011 12:57:05 Z
Chris Nighswonger [Tue, 6 Dec 2011 12:57:05 +0000 (07:57 -0500)]
Release Notes for 3.06.02.000 06 Dec 2011 12:57:05 Z

12 years agobug_5211: LostItem() - added charge_fee param to control fee charging
Srdjan Jankovic [Fri, 2 Dec 2011 00:26:50 +0000 (13:26 +1300)]
bug_5211: LostItem() - added charge_fee param to control fee charging

Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug7108: Intranet Language Menu Display Patch
Martin Renvoize [Fri, 28 Oct 2011 14:30:39 +0000 (15:30 +0100)]
Bug7108: Intranet Language Menu Display Patch

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix a problem when translations contain &nbsp; various XSL files
Frédérick Capovilla [Wed, 2 Nov 2011 14:56:33 +0000 (10:56 -0400)]
Fix a problem when translations contain &nbsp; various XSL files

With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.

This patch applies to HEAD and 3.6.x.

How to test:

  - checkout 3.6.x branch
  - generate French templates:
    cd misc/translator
    ./translate install fr-FR
    cd ../..
  - run test:
    prove -v t/00-valid-xml.t
    you get failing error message
  - apply this patch
  - run test again: it passes

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
http://bugs.koha-community.org/show_bug.cgi?id=7141
(cherry picked from commit 7534c34cdb272987122ef106e9d4523f10ff178e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2616: Remove unnecessary 'use HTML::Template' calls
Ian Walls [Sun, 4 Dec 2011 17:31:22 +0000 (12:31 -0500)]
Bug 2616: Remove unnecessary 'use HTML::Template' calls

Removes deprecated calls to HTML::Template or HTML::Template::Pro from:
C4/Output.pm
catalogue/export.pl
reports/issues_by_borrower_category.plugin
reports/itemtypes.plugin

Only remaining calls are in misc/cronjobs/rss/rss.pl, misc/cronjobs/smsoverdues.pl,
and t/test_template.pl.  These scripts still legitimately depend on H:T:P

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6132: preference were case sensitive.
Henri-Damien LAURENT [Thu, 3 Mar 2011 11:02:38 +0000 (12:02 +0100)]
Bug 6132: preference were case sensitive.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7120 - After deleting order from order receive page redirect fails
Owen Leonard [Mon, 31 Oct 2011 15:01:35 +0000 (11:01 -0400)]
Fix for Bug 7120 - After deleting order from order receive page redirect fails

The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit dc249205a26426cba0751dcc544996fefa3ede71)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6786: Follow up fixing index names with hyphens
Marcel de Rooy [Sun, 4 Dec 2011 16:29:05 +0000 (17:29 +0100)]
Bug 6786: Follow up fixing index names with hyphens

Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7137 - fixed width table where it should be variable
Owen Leonard [Wed, 2 Nov 2011 14:08:25 +0000 (10:08 -0400)]
Fix for Bug 7137 - fixed width table where it should be variable

Removing inline style setting the table width.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across...
Liz Rea [Mon, 31 Oct 2011 21:16:34 +0000 (16:16 -0500)]
Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.

To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.

Signed-off-by: Arslan Farooq <arslanone@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit e0cba61e316ad13001052421d1f3a5c6844fbe03)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7108 - OPAC Translations Display Patch
Martin Renvoize [Thu, 27 Oct 2011 16:58:28 +0000 (17:58 +0100)]
Bug 7108 - OPAC Translations Display Patch

If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and  the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoAdding a git mailmap file to allow standardizing of commit author's names/email
Chris Nighswonger [Mon, 5 Dec 2011 02:07:49 +0000 (21:07 -0500)]
Adding a git mailmap file to allow standardizing of commit author's names/email

12 years agoAdding template for autogeneration of 3.6.x release notes
Chris Nighswonger [Mon, 5 Dec 2011 02:02:01 +0000 (21:02 -0500)]
Adding template for autogeneration of 3.6.x release notes

12 years agoRelease Notes for 3.06.02.000 05 Dec 2011 01:51:54 Z
Chris Nighswonger [Mon, 5 Dec 2011 01:51:54 +0000 (20:51 -0500)]
Release Notes for 3.06.02.000 05 Dec 2011 01:51:54 Z

12 years agoRelease Notes for 3.06.02.000 04 Dec 2011 21:10:25 Z
Chris Nighswonger [Sun, 4 Dec 2011 21:10:25 +0000 (16:10 -0500)]
Release Notes for 3.06.02.000 04 Dec 2011 21:10:25 Z

12 years agoBug 7041: Sort >1000 search results with sortmax parameter in zebra config file
Marcel de Rooy [Mon, 17 Oct 2011 07:28:38 +0000 (09:28 +0200)]
Bug 7041: Sort >1000 search results with sortmax parameter in zebra config file

By default, zebra does not sort more than 1000 records (search results). You
can increase this number by adding the sortmax parameter in zebra-biblios.cfg.

Putting this value in Koha's zebra config file will make this default value
visible and make it easier to increase it if one prefers that.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7008 - create tmp dir for zebra
Robin Sheat [Wed, 12 Oct 2011 05:29:28 +0000 (18:29 +1300)]
Bug 7008 - create tmp dir for zebra

Sometimes zebra needs a tmp dir in order to work. This ensures that it
is created both by koha-create-dirs in the packages, and by
rebuild_zebra when it runs.
--

tested ok, signing off
Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit 849547df68e224100ebfa13f76f7c6ef1d826460)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6997: Koha-remove leaves system in inconsistent state
Jared Camins-Esakov [Mon, 10 Oct 2011 12:11:14 +0000 (08:11 -0400)]
Bug 6997: Koha-remove leaves system in inconsistent state

If you accidentally delete one of the files that koha-remove is supposed to
remove, when koha-remove reaches that point in the script, it will die, leaving
later removal steps undone. This patch fixes the problem by checking for the
existence of each file prior to deleting it, so that short of an actual problem
with removing the file, the script can continue. Note that the fix for bug 6929
is also needed to prevent any problems with stopping Zebra from killing
koha-remove.

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
(cherry picked from commit 602c528e91047e1c6c95679b8cddd7e85ddb54d5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6914 - fixes for the color option of koha_perl_deps.pl
Greg Barniskis [Mon, 26 Sep 2011 16:15:06 +0000 (11:15 -0500)]
Bug 6914 - fixes for the color option of koha_perl_deps.pl

Reset the terminal color mode after reporting (to avoid polluting the
user's shell), and use blue instead of white for the report header and
footer.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6926 : overdue_notices don't send itemcount to notification
Paul Poulain [Tue, 27 Sep 2011 13:13:01 +0000 (15:13 +0200)]
Bug 6926 : overdue_notices don't send itemcount to notification

In advanced_notices.pl you can return the number of due items using <<count>>
flag.
If you use this flag in overdue_notices, it does not work, no number is
displayed.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6966 Updated Patron Attribute Help File
Nicole C. Engard [Wed, 19 Oct 2011 23:04:57 +0000 (19:04 -0400)]
Bug 6966 Updated Patron Attribute Help File

A new patch required an additional line in this help
file.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7105: Bad request in GetSubscriptions
Christophe Croullebois [Thu, 27 Oct 2011 13:50:19 +0000 (15:50 +0200)]
Bug 7105: Bad request in GetSubscriptions

If $string or $issn is passed to GetSubscriptions, the request is false.
See Bug 5864, especially the last comment from Frédérick Capovilla.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 32317878c0e2cbf858e8a21466d01ab3c4df3aec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6699 follow-up
Paul Poulain [Sat, 3 Dec 2011 06:43:15 +0000 (07:43 +0100)]
Bug 6699 follow-up

The warn $error will issue this message if there is a message.
It's because how warn $blabla works : it does not work, you have to add ""
(cherry picked from commit 869f83a4cee1e0824b5fecb3e9fa9a9d7ae807e5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago6699 Add not-empty check for warnings from load_sql in Installer
Marcel de Rooy [Wed, 10 Aug 2011 13:23:07 +0000 (15:23 +0200)]
6699 Add not-empty check for warnings from load_sql in Installer

Eliminates fake warnings "Something is wrong on line 530".

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6303: Display Organisation and Parent Organisation names when viewing a borrower...
Srdjan Jankovic [Wed, 16 Nov 2011 23:45:47 +0000 (12:45 +1300)]
Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised, doesn't affect display for non-organisational patrons.

Note: Display change in OPAC only affects the summary tab.
It would be a little bit more consistent to make the name show the
same on all tabs in OPAC patron account.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4877 - Add DocBook for missing manual pages
Magnus Enger [Mon, 17 Oct 2011 10:23:09 +0000 (12:23 +0200)]
Bug 4877 - Add DocBook for missing manual pages

Add DocBook manual pages for commands that do not have a manual page yet. Also
add a page for koha-common itself, listing all the available commands.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Minor change: I fixed a typo I spotted
(cherry picked from commit fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7073: GetCOinSBiblio should take $record object, not biblionumber
Ian Walls [Thu, 20 Oct 2011 19:54:07 +0000 (15:54 -0400)]
Bug 7073: GetCOinSBiblio should take $record object, not biblionumber

This patch changes the GetCOinsBiblio subroutine to take a MARC record object
(as returned from GetMarcBiblio) instead of a biblionumber.  The first thing the subroutine
did was GetMarcBiblio, and the $biblionumber passed was never used again.

This subroutine was only used 3 places: opac/opac-search.pl, opac/opac-detail.pl,
and C4/VirtualShelves/Page.pm.  In the first and last cases, it was used in a loop.
In the last two cases, a call to GetMarcBiblio had already been done.  This is expensive, and
we were doing it twice per record.

For opac/opac-search.pl, the call to GetMarcBiblio was moved to just outside GetCOinSBiblio;
this will not change the performance at all.  But for opac/opac-detail.pl and C4/VirtualShelves/Page.pm,
a redudant call to GetMarcBiblio is now avoided.

To Test:
1. Enable COinSinOPACResults in system preferences.  Perform a search in the OPAC.
   Verify that the COinS spans are showing up
2. View the detail record of one of the returned items.  Confirm that the COinS span exists on the detail page.
3. View a list in the OPAC.  Confirm that COinS spans are still showing up

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
Robin Sheat [Fri, 15 Jul 2011 03:04:31 +0000 (15:04 +1200)]
Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series

This brings all the changelog entries for releases up to what has been
included in the packages

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7091 - [MASTER] - update the build version for packages from master
Robin Sheat [Wed, 26 Oct 2011 02:03:36 +0000 (15:03 +1300)]
Bug 7091 - [MASTER] - update the build version for packages from master

This updates the default version number that packages are build with to
be 3.7. This should be applied to master only.

Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit 03dffd8374ee3df9836346b56d56d9bdd2e32e31)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agofixing the translatable-template.t to handle localized setups
Paul Poulain [Mon, 28 Nov 2011 11:13:42 +0000 (12:13 +0100)]
fixing the translatable-template.t to handle localized setups

Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."

Now the test work on my (french setup)
(cherry picked from commit c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRevert "Fix for Bug 6291, Cart printing truncated in Firefox"
Paul Poulain [Wed, 30 Nov 2011 16:12:06 +0000 (17:12 +0100)]
Revert "Fix for Bug 6291, Cart printing truncated in Firefox"

see
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279

This reverts commit da0a5b2bd63027102dd61789fc455941e237abc9.
(cherry picked from commit c7ef4da571cc5451e4922a0ad0f5a2d285d91f77)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7191 Remove GetBorrowerIssues from @EXPORT
Colin Campbell [Tue, 8 Nov 2011 12:46:39 +0000 (12:46 +0000)]
Bug 7191 Remove GetBorrowerIssues from @EXPORT

No subroutine GetBorrowerIssues exists in C4::Circulation
So don't export it into users' namespace

Signed-off-by: Albert Oller <ago@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7268: Fixing failing tests for translatable templates
Chris Cormack [Mon, 7 Nov 2011 02:30:20 +0000 (15:30 +1300)]
Bug 7268: Fixing failing tests for translatable templates

To test run

perl xt/author/translatable-templates.t

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test runs without any complaints about the fixed templates now.
Also checked detail pages without XSLT turned on display correctly.
(cherry picked from commit 66fa8288461c8f14108a507de91977b3394d1c0c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6894: Order from suggestion defaulting to wrong currency
Katrin Fischer [Tue, 25 Oct 2011 15:38:04 +0000 (17:38 +0200)]
Bug 6894: Order from suggestion defaulting to wrong currency

This problem turned out to be a bit different, than I initally thought.

This patch fixes the currency selections for new orders created in staff.
Before this patch, the first currency in the list was selected instead
of the active currency. So you needed to change it explicitly.

After patch it should work like this:

1) Suggestion created in OPAC - currency defaults to NULL in database
2) Editing a suggestion created in OPAC will default to active currency.
3) Creating a new suggestion in staff will default to active currency.
4) When ordering, the currency will default to the vendor currency, if no
currency is set in the suggestion. (still happens, when suggestions are accepted
in batch from the list.

I hope this is right - comments and testing appreciated.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Verified the existence of the bug, and that the fix works as advertised.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 3388: Restore account number on vendor page
Katrin Fischer [Fri, 28 Oct 2011 15:33:31 +0000 (17:33 +0200)]
Bug 3388: Restore account number on vendor page

This patch makes it possible to add the account number to the
vendor information. The used field aqbookseller.accountnumber was
already existent in the database.

To test:
1) Add a new vendor with accountnumber
> Verify form has a field for accountnumber
> Verify accountnumber does show up on vendor summary page
2) Edit this vendor, change accountnumber
> Verify change was correctly saved and new number is displayed on
vendor summary page
3) Delete accountnumber

Signed-off-by: Liz Rea <lrea@nekls.org>
Tested 1-3, no troubles found.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7254 Show pending orders from baskets with closedate > 180 days
Marcel de Rooy [Wed, 23 Nov 2011 12:33:26 +0000 (13:33 +0100)]
Bug 7254 Show pending orders from baskets with closedate > 180 days

Current code for selecting pending orders does not select orders from baskets
with a closedate > 180 days.
The code in Acquisition.pm already includes a FIXME for that.
IMHO this part of the where clause should just be removed; an order is pending
until it is filled. If you do not want to fill it, delete it.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7242 : Fixing typo in a div
Chris Cormack [Thu, 17 Nov 2011 23:12:29 +0000 (12:12 +1300)]
Bug 7242 : Fixing typo in a div

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7250: stage_biblios_file.pl is missing options for encoding
Katrin Fischer [Mon, 21 Nov 2011 06:54:15 +0000 (07:54 +0100)]
Bug 7250: stage_biblios_file.pl is missing options for encoding

- adds command line options for encoding, defaulting to utf8
- options match options availablen in the stage marc records form
  of the staff interface
- activates warnings
- adds copyright statement

To test:
Import records with diacritics using the stage_biblios_file.pl
Records can be imported into the catalog using the staff interface
or the commit_biblios_file.pl script.

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Successfully tested with default encoding utf8.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6877 - use is executed and errors at compile time
Colin Campbell [Sat, 17 Sep 2011 11:45:09 +0000 (12:45 +0100)]
Bug 6877 - use is executed and errors at compile time

Although use is being called in an eval it will still be executed
at compile time so that an error can cause the script to abort before
the eval is executed. The eval expression syntax is not checked
so eval block should be preferred.
Use require/import which execute at runtime which is the intention
here.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
checked that, with Libravatar OK things are still OK
(cherry picked from commit 4f49dc5ad05289820916c6fd879e70f3adeee253)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4330: Missing License Statement
Chris Cormack [Mon, 21 Nov 2011 07:30:19 +0000 (20:30 +1300)]
Bug 4330: Missing License Statement

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 40bd14e0ea98152377a0a416482fe0227fee17bd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4330: Wrong address for Free Software Foundation
Chris Cormack [Mon, 21 Nov 2011 07:26:01 +0000 (20:26 +1300)]
Bug 4330: Wrong address for Free Software Foundation

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
(cherry picked from commit 93d4c90a681d527044567bbbb7d5f81aec31a6b5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago3.6.1 Translation Update
Frédéric Demians [Mon, 28 Nov 2011 17:58:34 +0000 (18:58 +0100)]
3.6.1 Translation Update
(cherry picked from commit d3c1927a0763adc8aa54e211e9289c386c8c8e9f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoRelease Notes for 3.06.01.000
Chris Nighswonger [Tue, 29 Nov 2011 02:37:44 +0000 (21:37 -0500)]
Release Notes for 3.06.01.000

12 years agoRelease Notes for 3.06.01.000 v3.06.01
Chris Nighswonger [Tue, 29 Nov 2011 01:20:19 +0000 (20:20 -0500)]
Release Notes for 3.06.01.000

12 years agoUpdating Version Number to 3.06.01.000
Chris Nighswonger [Tue, 29 Nov 2011 01:16:18 +0000 (20:16 -0500)]
Updating Version Number to 3.06.01.000

12 years agoBug 6628 : Stopping a potential vulnerability
Chris Cormack [Fri, 25 Nov 2011 18:39:51 +0000 (07:39 +1300)]
Bug 6628 : Stopping a potential vulnerability

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- verified help pages still work
- verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
show the template file (did work on master, not after applying patch)
- verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !
(cherry picked from commit 8664d195671c1a65af7b205b14099c1581c0500b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6629 : Follow up, sanitising in a couple more places
Chris Cormack [Sun, 27 Nov 2011 08:58:04 +0000 (21:58 +1300)]
Bug 6629 : Follow up, sanitising in a couple more places

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6629 : Follow up to trap vuln in webinstaller and fixing the error
Chris Cormack [Sun, 27 Nov 2011 08:18:29 +0000 (21:18 +1300)]
Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes problem occuring in web installer.
(cherry picked from commit 948f65344eb92aa6940ec02b575d6609d1af83f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6629 : Sanitizing input from language cookie
Chris Cormack [Fri, 25 Nov 2011 06:07:28 +0000 (19:07 +1300)]
Bug 6629 : Sanitizing input from language cookie

I dont think we can use only 2 digits, some languages is much longer
zh-hans-TW for example

But the regex should stop it bening able handle nasty chars,
whitelisting safe ones instead

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I checked the patch doesn't break language switching and language selection.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
I confirm the bug security issue was not here for master, but this fix improve the behaviour, so pushing it
(cherry picked from commit 9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoJoy nelson was already in history.txt, removing the entry
Paul Poulain [Fri, 18 Nov 2011 22:28:38 +0000 (23:28 +0100)]
Joy nelson was already in history.txt, removing the entry
(cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoIncremental fix for Bug 2847, Use HTML escape in templates where appropriate
Owen Leonard [Fri, 11 Nov 2011 17:34:44 +0000 (12:34 -0500)]
Incremental fix for Bug 2847, Use HTML escape in templates where appropriate

Fixes for output in a couple of acquisitions templates where
user-generated data should be escaped. This instances were found
by creating a vendor name like "Baker & Taylor" and finding
that the ampersand was not escaped, causing validation errors.

This patch also consolidates multiple <script> blocks which
do not need to be separate and corrects a couple of unclosed
<input> tags.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6799 rebuild_zebra.pl -x produces invalid XML records
Frédéric Demians [Sat, 27 Aug 2011 11:32:08 +0000 (13:32 +0200)]
Bug 6799 rebuild_zebra.pl -x produces invalid XML records

This patch allow to handle properly items containing extended characters and
send valid XML records to zebraidx

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7095: Fixing cut and paste error and removing the use of diag() as this does...
Chris Nighswonger [Wed, 26 Oct 2011 15:14:05 +0000 (11:14 -0400)]
Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6977: Follow-up patch : catch CloneSubfield errors
Frédérick Capovilla [Fri, 21 Oct 2011 16:04:03 +0000 (12:04 -0400)]
Bug 6977: Follow-up patch : catch CloneSubfield errors

A javascript error could occur if the CloneSubfield function failed for
any reason. This would prevent the popup from disappearing.

Example : Importing informations of a UNIF_TITLE authority with multiple
$x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
error occurs when trying to clone it.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6475 - Edit it's not possible in subfield "0" in MARC framework
Salvador Zaragoza Rubio [Wed, 22 Jun 2011 16:18:40 +0000 (18:18 +0200)]
Bug 6475 - Edit it's not possible in subfield "0" in MARC framework

When trying to modify the subfield "0" on a field in the
MARC subfield structure admin -> Tag xxx Subfield Constraints,
the boolean condition on liblibrarian fails for the initial "0" value.
Modified condition to allow the value "0"

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7134: patron records getting corrupted birthdates
Ian Walls [Thu, 17 Nov 2011 15:27:47 +0000 (10:27 -0500)]
Bug 7134: patron records getting corrupted birthdates

If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
is obviously incorrect (the result of passing 0 to the database directly)

The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
search, but testing will be required.

To test:
1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
2. search for a borrower by 1 part surname, confirm search works
3. search for a borrower by 2 part surname, confirm search works
4. search for a borrower across firstname AND surname; confirm
5. search for a borrower and include categorycode/branchcode filters

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
I confirm all working tests 1-5
1. Created patron with blank birthdate - birthdate was blank
2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
3. Searched for mr. acevedo using "Acevedo III" - result was correct
4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.

also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
Not complaining, just noting. :)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoupdating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
Paul Poulain [Thu, 17 Nov 2011 15:50:54 +0000 (16:50 +0100)]
updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
(cherry picked from commit 2216cd4371a72d95491dc51455d1ae7a6c783147)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoMake all strings translatable in marc21_field_007.tt
Frédérick Capovilla [Fri, 14 Oct 2011 19:52:30 +0000 (15:52 -0400)]
Make all strings translatable in marc21_field_007.tt

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan:
- apply patch
- update po files using 'perl translate update <language-code>
- check po files for new strings from 007 plugin
- translate some / all of them
- update templates with changed po files 'perl translate install <language-code>
- verify 007 still works and got translated
(cherry picked from commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7084 - Re-arranging results_summary for tags so that it applies where it is suppo...
Liz Rea [Mon, 24 Oct 2011 20:26:32 +0000 (15:26 -0500)]
Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to

To test:
Verify that New Tag text is the same size as all of the other surrounding text.
Verify that it is consistent in size with results that have existing tags.

See screenshot for what it looked like before:
http://screencast.com/t/hnt15kpS7SH9
Notice that the Add button and New tag text were slightly larger than the
similar constructions for results with existing tags. This patch should fix
that.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I made sure I had a results list with on record with tags and one without.
Before applying the patch the "New tag" text and "Add" button were
inconsistent for the two records, after applying it they look the same. Nice!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7221: C4/Biblio.pm documentation is incorrect.
Joy Nelson [Mon, 14 Nov 2011 22:23:49 +0000 (17:23 -0500)]
Bug 7221: C4/Biblio.pm documentation is incorrect.

$dbh is not a valid first parameter.  Removed $dbh from line 392 to show correct syntax.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 1d0192b85ceabca3dbb0add7df218a4d768ea104)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export...
Chris Nighswonger [Wed, 9 Nov 2011 19:51:01 +0000 (14:51 -0500)]
Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.

squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.

Don't change $_ in a list context

Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.

Signed-off-by: Brendan <brendan@bywatersolutions.com>
(cherry picked from commit 7824a1bc8da020b11fa9473f09fb7c6429390034)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 5150 - Issuing should read Circulation
Owen Leonard [Thu, 10 Nov 2011 21:28:53 +0000 (16:28 -0500)]
Follow-up fix for Bug 5150 - Issuing should read Circulation

Really just a typo, but I found it when trying to chase
down instances of this bug, so here you go.
(cherry picked from commit 55162ca84647b4ebc1b8a91ee94997ff7583ef15)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago(bug #4518) enhance 2.2 to 3.0 scripts
Nahuel ANGELINETTI [Mon, 17 May 2010 13:43:37 +0000 (15:43 +0200)]
(bug #4518) enhance 2.2 to 3.0 scripts

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 4161: Preselect active currency for new vendors
Katrin Fischer [Mon, 24 Oct 2011 15:48:29 +0000 (17:48 +0200)]
Bug 4161: Preselect active currency for new vendors

Currently when creating a new vendor in acquisitions the alphabetical first
currency will be preselected. For better usability and less mistakes the
active curency should be preselected.

To test:
Check your currency settings in administration.
Your active currency should not be the first in the list.

1) Create a new vendor
Verify the active currency is selected for list and invoice prices.

2) Check vendor summary page
Verify the correct currencies from the vendor record are shown here.

3) Edit vendor
Verify the correct currencies from the vendor record  are shown here.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified with tests 1, 2, and 3.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 2629: Add diacritic support for Ů (U with ring)
Ian Walls [Mon, 26 Sep 2011 20:38:39 +0000 (16:38 -0400)]
Bug 2629: Add diacritic support for Ů (U with ring)

Adds Ů and ů support to word-phrase-utf.chr.  These characters are used in
Czech, for example the author Martinů, Bohuslav (1890-1959)

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5945: email not searchable in patron search
Ian Walls [Fri, 4 Nov 2011 10:26:01 +0000 (06:26 -0400)]
Bug 5945: email not searchable in patron search

Adds 'email' to valid search parameters in members/member.pl

To test:
1. give a patron a unique email address in your test database
2. search on the full email; should work
3. search on the part of the email before the domain; should work

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7138: Can't print basket group order pdf
Katrin Fischer [Wed, 2 Nov 2011 23:44:36 +0000 (00:44 +0100)]
Bug 7138: Can't print basket group order pdf

PDF print of basket groups is broken.

To test:

1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
2) Create a basket with orders
3) Close the basket and create a basket group checking the checkbox
4) Print the basket group as PDF

Before patch the file is broken and when opened in an editor contains an error message.
After the patch the PDF should be generated correctly again.

Thx to Chris for helping me to fix the problem.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
Chris Cormack [Mon, 31 Oct 2011 07:57:19 +0000 (20:57 +1300)]
Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
tested with diacritics, no changes before and after the patch
(cherry picked from commit ee0627f20bee5df234ab284d1fdacebb857de57f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Tidying changed parts of file
Chris Cormack [Wed, 2 Nov 2011 03:27:48 +0000 (16:27 +1300)]
Bug 6679 : Tidying changed parts of file

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Don't declare variables in conditionals
Chris Cormack [Wed, 2 Nov 2011 03:24:05 +0000 (16:24 +1300)]
Bug 6679 : Don't declare variables in conditionals

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Not using strict .. bad script, no cookie for you!
Chris Cormack [Wed, 2 Nov 2011 03:19:36 +0000 (16:19 +1300)]
Bug 6679 : Not using strict .. bad script, no cookie for you!

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Don't declare variables in conditionals Don't change $_ in a list context...
Chris Cormack [Wed, 2 Nov 2011 03:13:20 +0000 (16:13 +1300)]
Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6679 : Declare variables outside of conditionals
Chris Cormack [Wed, 2 Nov 2011 03:00:01 +0000 (16:00 +1300)]
Bug 6679 : Declare variables outside of conditionals

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6390 Followup: Basket's authorisedby might not be a borrowernumber
Ian Walls [Tue, 18 Oct 2011 20:13:15 +0000 (16:13 -0400)]
Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber

aqbasket.authorisedby is not foreign key constrainted to borrowers.borrowernumber,
so if it's anything other than that, vendor search breaks by using an undefined value
(GetMember() on an invalid borrowernumber) as a HASH ref.

This patch sets the branchcode (the desired value from GetMember) to a blank value, then only
changes it if GetMember is defined.  In the case where the authorisedby librarian has been deleted,
or the value is otherwise invalid, and AcqViewBaskets is set to 'branch', the basket will not appear
except to superlibrarians

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Invalid borrowernumber in aqbasket.authorisedby no longer breaks search.
(cherry picked from commit 58bdfdb08883eb52777321f883491eaff1493857)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
Paul Poulain [Fri, 16 Sep 2011 22:58:41 +0000 (00:58 +0200)]
Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep

Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
As we don't support anything outside from mysql, returning directly mysql directly

If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway

Testing note:
Drops execution time of the line from 300ms to 20 microseconds (in my testing).
(cherry picked from commit 0f8db0c53866afaf5171869359c558d1e9f4325e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7185: Fix updatedatabase message for 3.6.0 release
Julian Maurice [Sun, 6 Nov 2011 08:44:40 +0000 (14:14 +0530)]
Bug 7185: Fix updatedatabase message for 3.6.0 release

Signed-off-by: François Charbonnier <francois.charbonnier@biblibre.com>
(cherry picked from commit e228f233e4638fdbeb77495fafb8453045d43302)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7184 raise mySQL error if debug is set
Paul Poulain [Sun, 6 Nov 2011 08:36:52 +0000 (09:36 +0100)]
Bug 7184 raise mySQL error if debug is set

Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error

Step to test:
=== BEFORE PATCH ===
go anywhere, and change a mySQL statement to make it invalid.
Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results

=== AFTER PATCH ===
Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
SetEnv DEBUG 1
restart/reload Apache
Launch the same page, you'll get a Perl statement saying something like:

DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
(cherry picked from commit 016e66c6f25fbe3b648bcb8dad8d59f80d11b992)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7128 - adding some ID's to make styling opac-main.tt a bit easier
Liz Rea [Tue, 1 Nov 2011 19:01:17 +0000 (14:01 -0500)]
Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier

To test:
verify that the loggedin id is added when user is logged in
verify that the notloggedin id is evident when no user is logged in.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Bug 7128 : Follow up, adding the id to the case when a user is not logged in

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6994: Wrong 'no budget defined' alert
Katrin Fischer [Mon, 24 Oct 2011 18:59:57 +0000 (20:59 +0200)]
Bug 6994: Wrong 'no budget defined' alert

When ordering from an existing record the 'no budgets and funds defined' error
message was shown below the result list.

To test:
A) No budgets defined for this user and library
Basket summary page shows a warning instead of the link for creation
of orders.

B) Budgets and funds are properly defined for this user and library
Basket summary page shows links for order creation.
Before patch: A search for an existing record had the alert at the bottom
of the search result list.
After patch: The links for creation of orders are shown instead.

Signed-off-by: Liz Rea <lrea@nekls.org>
Verified A and B.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoNotify the user on his account page when his account is almost expired
Frédérick Capovilla [Wed, 5 Oct 2011 19:12:04 +0000 (15:12 -0400)]
Notify the user on his account page when his account is almost expired

New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
notification appears in the user's account page if his subscription is almost
expired.

http://bugs.koha-community.org/show_bug.cgi?id=6978
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
works perfectly with date formatted DD/MM/YYYY as well
(cherry picked from commit e676e117fccfaa8208742c17a08cb92056286f95)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6471: add tablesorter to Holds Queue
Ian Walls [Tue, 20 Sep 2011 13:22:46 +0000 (09:22 -0400)]
Bug 6471: add tablesorter to Holds Queue

This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFix for Bug 7085 - Problems with searching for orders in acquisitions
Owen Leonard [Tue, 25 Oct 2011 14:16:02 +0000 (10:16 -0400)]
Fix for Bug 7085 - Problems with searching for orders in acquisitions

Changing "if ( defined $input )" to "if ( $input )" in the section
of the script which builds the order search query seems to give
successful searches where they didn't exist before. Searches from
the advanced order search screen work with title, author, vendor,
basket number, date, etc.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Searches for date ranges, title and author keywords give
me the correct results now.
(cherry picked from commit 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
Katrin Fischer [Mon, 31 Oct 2011 00:06:17 +0000 (01:06 +0100)]
Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name

To test:
1) Add some suggestions
2) Go to suggestions in staff
3) Choose from filters 'suggested by' or 'managed by'
4) Compare names shown on tabs with names in list of suggestions

Before patch: tab name has the wrong order, while list name is correct.
After patch: all names should be consistent and correct.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years ago7146 (Update timestamps when deleting a biblio)
Marcel de Rooy [Thu, 3 Nov 2011 12:41:24 +0000 (13:41 +0100)]
7146 (Update timestamps when deleting a biblio)

Currently, when you delete an item, the timestamp column in deleteditems is
updated with current time. (This comes from an [unintentional] additional
update statement in DelItem.) It makes deletion time visible.
In the past, the marcxml was updated too at that moment, resulting in an
updated timestamp in biblioitems too. The timestamp in biblio was not touched.

If you delete a biblio however, the timestamps in deletedbiblio and
deletedbiblioitems do not reflect time of deletion. They still show the time of
last update before the record was deleted. This last update can be extracted
from MARC field 005 too.

This behavior is not consistent nor logical. I would suggest to add a statement
in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
makes the time of deletion visible in the record too. The time of deletion of a
biblio can be very useful for e.g. synchronizing purposes.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
Owen Leonard [Fri, 4 Nov 2011 18:56:50 +0000 (14:56 -0400)]
Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology

Fixing two stray instances of "supplier."
(cherry picked from commit 0038b0df15a838468bf7c23a389c260075dfd1c4)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7061: unnecessary global variables declared in C4::SQLHelper
Ian Walls [Wed, 19 Oct 2011 00:17:17 +0000 (20:17 -0400)]
Bug 7061: unnecessary global variables declared in C4::SQLHelper

Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
all instances of $table are locally scoped to the subroutines, and $hash is never used.

This may help with persistance; if not, it's at least a bit of trivial cleanup.

To test:

1.  Search for a patron
2.  Create a Contract in Acquisitions
3.  Modify that Contract
4.  Delete that Contract

All instances should return error free.  This checks the subroutines of SQLHelper

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6989 Patron categories not properly displayed if not pure ASCII
Frédéric Demians [Sat, 8 Oct 2011 13:30:59 +0000 (15:30 +0200)]
Bug 6989 Patron categories not properly displayed if not pure ASCII

C4::Category module returns badly encoded patron categories when they are
containing non pure-ASCII characters.

To reproduce this bug:

  - Go in Administration > Patron Categories
  - Add a new category. Give it this code for example:
    Café
  - Click on Patrons link on top menu
  - Click on New button

    => You get 'Café' displayed without accent

Signed-off-by: Piotr Wejman <ropuch@bagno.be>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 5885 : UNIMARC XSLT changes
Paul Poulain [Wed, 15 Dec 2010 13:05:04 +0000 (14:05 +0100)]
Bug 5885 : UNIMARC XSLT changes

dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I can't test this works ok for UNIMARC, but it does not cause any
problems with the translation scripts or MARC21 so signing off
(cherry picked from commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 7076: Lists render OPAC XSLT on staff side
Ian Walls [Fri, 21 Oct 2011 15:43:17 +0000 (11:43 -0400)]
Bug 7076: Lists render OPAC XSLT on staff side

Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
OPACResultsXSLT if the $type is 'opac'.  Since parsing the XML is such an expensive
thing, and the resulting XSLTBloc is not used on the staff side, this will increase
performance for Lists in the intranet

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoFollow-up patch : use the subfield associated with items.barcode
Frédérick Capovilla [Mon, 17 Oct 2011 20:01:29 +0000 (16:01 -0400)]
Follow-up patch : use the subfield associated with items.barcode

Instead of using the 'p' subfield directly, use the subfield letter
associated with the items.barcode column.

http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test cases tested:
- 1 item, barcode empty
- 2 items, barcodes both empty
- 1 item, existing barcode
- 1 item, new barcode
- 2 items, one barcode empty, one existing

All test cases worked nicely and gave correct error messages.

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

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6963: Corrects a problem when a new order is created with a duplicate barcode.
Frédérick Capovilla [Mon, 3 Oct 2011 19:00:05 +0000 (15:00 -0400)]
Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.

If the AcqCreateItem preference is set to "ordering" and the barcode for
the new item is already in use, no error is returned, but an invalid
itemnumber is saved in the aqorders_items table and the item is never
created.

This patch adds a duplicate barcode verification in neworderempty.pl
_koha_add_item is also modified so it won't return an invalid ID when
an item can't be added.

http://bugs.koha-community.org/show_bug.cgi?id=6963
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan on second patch.
(cherry picked from commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
12 years agoBug 6895 : First attempt at fixing the diacritics bug
Chris Cormack [Wed, 5 Oct 2011 03:39:08 +0000 (16:39 +1300)]
Bug 6895 : First attempt at fixing the diacritics bug

This is a fairly hacky solution, a counter patch would be more than
welcome

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Updated, translated and installed German po files after applying this patch.
No problems found.

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

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