Commit graph

16311 commits

Author SHA1 Message Date
Juan Romay Sieira
16e067953b Bug 7855 - marcflavour files changed to set the maxlength field into fresh installs. Include NORMARC in updatedatabase to change maxlength.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 17:20:13 +02:00
MJ Ray
1aef5ab44e Bug 6267 custom http user-agent in check-url.pl (fix for books.google.com 401 error)
Patch by Judit with a small change to the help wording.
Sponsored by CALYX information essentials.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 12:08:17 +02:00
Paul Poulain
6eb021ab0e Merge remote-tracking branch 'origin/new/bug_5347' 2012-04-19 11:53:44 +02:00
Chris Cormack
d83a71d8e6 Bug 5347 Follow up, fix for broken test 2012-04-19 11:40:02 +02:00
Paul Poulain
3dfe9903a5 Bug 7726: explanation and options that were in the wrong order
I also removed the ` mysql-ism

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-19 11:31:53 +02:00
4916080bc2 Bug 7950 - Typo for preference intranetuserjs
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:30:28 +02:00
Gaetan Boisson
5cb92abdcd Bug 7693 - clear screen button misaligned
This patch removes firefox specific lines in the css which were breaking the display

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

This fixes the layout problem in current versions of Firefox. I think
the CSS which is removed by this patch might be necessary for older
versions of Firefox, but if this turns out to be a problem we can
follow up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:29:45 +02:00
096447f086 Bug 7828 - On circulation home page, URL to offline circulation Firefox addon should be a hyperlink
Along with making the URL a hyperlink I removed the language
part of the URL ("/fr/"). The link correctly redirects to 'en'
for me. I'm curious whether it will for other languages.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Link works and redirects to my language (english).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

(Redirects to fr if your browser is FR)
2012-04-19 11:22:11 +02:00
Katrin Fischer
36fe07c3b6 Bug 3337 - RSS link is not correct for searches without results
RSS links for searches without results didn't have the search terms.

To test:
- Search for something with results and check RSS link
- Search for something with no results and check RSS link

In both cases your search should show up in the link.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

RSS Link works in both cases listed in test plan.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:21:24 +02:00
Katrin Fischer
b42a9c46ca Bug 7371: Add 'cardnumber' as option for AutoEmailPrimaryAddress
The systempref.sql file had one more option 'cardnumber' that was not
visible from the system preference editor. This patch adds the setting.

To test:
- Check new setting cardnumber is available for AutoEmailPrimaryAddress
- Use setting with a patron that has an email address as cardnumber and
verify email is sent out correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:20:02 +02:00
Katrin Fischer
36b7239f40 Bug 7733 - HidePatronName not working on moredetail
Patch implements HidePatronName system preference for 'Checkout status'
on moredetail (tab items from staff detail page).

Also adds some new 'if' statements, so 'Serial enumeration' and 'Paid for?' are
only shown when they are not empty.

Silences warns in the logs.

To test:
- Toggle system preference for an issued item and check name/cardnumber
are displayed correctly.
- Check serial enumeration and Paid for? show when not empty.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 11:05:09 +02:00
Katrin Fischer
b302e4a525 Bug 7833 - unique holiday link broken
As Nicole stated on the bug the branchcode was missing from the links.

To test:
- add unique holidays to calendar for different branches
- click on link and check that the date is opened in the right calendar

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Clicked links for unique holidays and exceptions for
multiple branches and everything works perfectly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 10:54:00 +02:00
Katrin Fischer
d8aa557fc9 Bug 7845: Multiple 260s don't display properly in search results
Corrects display for multiple 260 fields in intranet and OPAC.
In intranet the order of fields was wrong on the detail page.
In OPAC and intranet punctuation for multiple 260 fields in the
result list was not displaying properly.

Example after correction:
Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-19 10:51:33 +02:00
Katrin Fischer
5958ec3e96 Bug 7922: Fixing typo in German sample news
Fehlerkorrektoren > Fehlerkorrekturen

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 10:40:30 +02:00
Paul Poulain
90d13965d3 Revert "Bug 7785: Remove unused function columns() which uses a MySQLism."
This reverts commit 1c8df08aea.

See:
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7785#c5
and
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7975

This patch broke tools/import_borrowers.pl

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-19 10:21:58 +02:00
452b81f769 Bug 7962 - Cart missing from result lists
Removing duplicate inclusion of jQuery on the results page
which was added with the star ratings feature. Koha already
uses jQuery by default.

I have also made the inclusion of ratings JS and CSS dependent
on ratings being turned on.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 18:06:51 +02:00
Katrin Fischer
443cd120f3 Bug 7354: Can't edit local use system preferences
Fixes adding and editing of local use system preferences and redirects to correct
page after saving.

To test:
- Create a new local use system preference
- Edit an existing local use system preference from summary page
- Edit an existing local use system preference using 'Edit'
- Delete a local use system preference

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 18:03:34 +02:00
mveron
51b21b1b57 Bug 7528 - amount subtracting 1 cent
Rounding issue with JavaScript and float numbers, JavaScript changed to do no calculation if discount is 0

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:30:14 +02:00
Katrin Fischer
890f92203b Bug 7927 - library not showing on subscription full history anymore
Restores former functionality:
Shows the branchcode in the branch column for the full history
view of subscriptions in OPAC.

http://bugs.koha-community.org/show_bug.cgi?id=7929
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Branch codes are visible again.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:27:26 +02:00
Katrin Fischer
bd1d643fad Bug 7958 - Batch Item Delete Fails
Adding back "use C4::Search;" in Items.pm fixes the problem.

I think this is probably related to the denesting efforts.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:09:50 +02:00
Jonathan Druart
f15d3de96c Bug 5347: Followup: FIX 2 bugs in lateorders
1/ Failed to claim late orders (Can't use string as a HASH ref)
2/ Don't show the red error message after submit the form for claims

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1/ Fixed.
2/ Also fixed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 17:05:23 +02:00
Paul Poulain
1ee7f449be Merge remote-tracking branch 'origin/new/bug_5347' 2012-04-18 17:02:25 +02:00
Ian Walls
ff29f978af Bug 5374 [SIGNED-OFF] Followup: adds conditional check to unit test for late orders
If there are no late orders in the database, the 5th unit test for C4/Acquisition.pm
fails, since no date is returned (and today's date is expected)

This patch adds a conditional check around whether any late orders are actually returned
by GetLateOrders. If so, tests proceed, if not, they're skipped.  This seems to quiet
the failures in the automated test suite.

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

signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-04-18 17:01:24 +02:00
Paul Poulain
367c4fb881 Merge remote-tracking branch 'origin/new/bug_7016' 2012-04-18 16:54:44 +02:00
Galen Charlton
dc1d934c8f bug 7016 further followup: clarify return of GetItemnumbersForBiblio
New function was actually returning an arrayref, so made
perldoc and function usage consistent.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-18 16:48:30 +02:00
Ian Walls
f84671dce9 Bug 7016 Followup: Add new GetItemnumberForBiblio subroutine
Adds a new subroutine in C4::Items, GetItemnumbersForBiblio, which takes a
single biblionumber, and returns an array of all the corresponding itemnumbers.

This patch also replaces the usage of get_itemnumbers_of in C4::Reserves::CanBookBeReserved
with this new subroutine, as the output is more consistent with what we were
lookng for (this is what fixes the bug issue).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2012-04-18 16:48:25 +02:00
Chris Nighswonger
012c6df001 Bug 7902 - Adding Function to Check for Existence of Tables
This patch adds a function TableExists which checks for the existence
of a given table and returns 1 or 0 accordingly. This allows us to
check for the existence of a given table when doing operations on
tables which may not exist in a given database which, in turn, will
reduce the number of red errors which show up after an upgrade.

An example of its use is included in this patch.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 16:20:02 +02:00
Nicole C. Engard
3827973408 Bug 7936: Reports Help Files for 3.8
This updates the existing help files and adds a new
help file for the holds stats report.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 16:12:39 +02:00
Nicole C. Engard
4a99852ccf Bug 7936: Patron Help Files 2012-04-13 16:12:38 +02:00
Nicole C. Engard
671e85cc52 Bug 7936: Catalogue Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:37 +02:00
Nicole C. Engard
ae36d24ab3 Bug 7936: Patron Card Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
21d39dad96 Bug 7936: Label Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:35 +02:00
Nicole C. Engard
e8c21311b4 Bug 7936: Circ Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:34 +02:00
Nicole C. Engard
96830bcd5e Bug 7936: Holds Help File for 3.8
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:33 +02:00
Nicole C. Engard
99c3506073 Bug 7936: Comments Moderation Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:31 +02:00
Nicole C. Engard
6961c3880f Bug 7936: Suggestion help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:30 +02:00
Nicole C. Engard
2fd001b8f5 Bug 7936: Authorities Help Files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:29 +02:00
Nicole C. Engard
daf1343ba3 Bug 7936: Marc Export Help File
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:28 +02:00
Nicole C. Engard
b8dba5b81f Bug 7936: Tags help file
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:27 +02:00
Nicole C. Engard
8e0fa49184 Bug 7936: Tools Help for 3.8
This updates the tools help files and adds a new
help file for the new upload cover images tool.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:26 +02:00
Nicole C. Engard
72f91afd9c Bug 7936: Cataloging Help Files
These are the updated help files for cataloging

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:25 +02:00
Nicole C. Engard
3d06358f84 Bug 7936: Help file for Lists
This is the 3.8 help file for lists.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:24 +02:00
Nicole C. Engard
62a23201c3 Bug 7936: 3.8 Help Files
These are the three help files that do not belong in any
specific directory. Links updated to the 3.8 manual.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-13 16:12:23 +02:00
468995e4b3 Bug 5345 [FOLLOW-UP] DataTables in Koha
Adding missing images: The "disabled" version of the next,
previous, first, and last buttons.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 15:44:24 +02:00
Paul Poulain
8070cef696 Merge remote-tracking branch 'origin/new/bug_5668' 2012-04-13 15:32:25 +02:00
mveron
b42d662542 Bug 5668 Error during during insall with web installer, Step 3
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Before patch web installer dies with error message on creating
database tables:
ERROR 1064 (42000) at line 2821: You have an error in your SQL
syntax; check the manual that corresponds to your MySQL server
version for the right syntax to use near '- biblionumber int(11)
NOT NULL, - rating_value tinyint(1) NOT NULL, - ' at line 2

After patch installation completes normally. I also checked
that tables ratings and pending_offline_operations were
created correctly.

Note: This is Marc Veron's first patch for Koha - congratulations!
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-13 15:29:53 +02:00
Colin Campbell
b5ac4a852f Bug 7831 : Sort budgets for selection in new order
The select budget dropdown list should be presented in
an ordered fashion. To achieve this sort the budget array
by the visible text.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 18:24:39 +02:00
Paul Poulain
b20c2d6857 Merge remote-tracking branch 'origin/new/bug_7876' 2012-04-12 18:11:05 +02:00
f21b6eee2f Bug 7876 - Followup - Fix span tag position, add fine amount spans.
Span was outside, the if statement, could possible cause problems
with jQuery customizations, moved span to inside the conditional.

Also added span for the fine amount itself, so that it may be
re-used for jQuery customizations.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Passed tests, spans appear to be correct.
2012-04-12 18:10:51 +02:00
Katrin Fischer
3e82127fb8 Bug 2034: Removing unused scripts billig.pl/billing.tt
- Scripts are currently not linked from anywhere in the templates
- Functionality can also be achieved with a custom report
- There are unresolved problems with the sql in the existig scripts

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 18:09:54 +02:00