Commit graph

16296 commits

Author SHA1 Message Date
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
430f0ea6ba Bug 7940 - Placing a hold on a single item from the staff cart causes errors
This is caused by the javascript function placeHold() in basket.pl
The cause of this error is thus: when a staff member uses the cart
to place holds on multiple items at once, the cart redirects to
reserver/request.pl with the params 'biblionumbers' ( a string of
biblionumbers separated by slashes ( e.g. '5/4/3/' ) and the param
multi_hold with a value of 1.

When multi_hold is enabled, request.pl splits the string 'biblionumbers'
on those slashes and works on that list.

In placeHold(), when only one item is checked, the system passes
the param biblionumbers with a single biblionumber ( e.g. '5/' )
and does *not* pass the multi_hold param. This causes request.pl
to not parse the biblionumbers param, and thus reserve.pl has
no biblionumber to work on ( hence our error here ).

There are two options to resolve this:
A) Add the multi_hold param even for a single hold from the cart.
B) In the event of a single hold being placed from the cart,
   switch to the standard single hold url ( i.e. request.pl?biblionumber=234 )

This commit resolves the situation using option B, as it seems more
logical than using the multi-holds system for a single hold.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, works as advertised. Good catch!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 17:58:49 +02:00
Serhij Dubyk {Сергій Дубик}
aec4ba8985 Bug 7838 - Add sort-string-utf.chr for Ukrainian and Russian
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 17:23:53 +02:00
Katrin Fischer
d55cde8ae5 Bug 7834: order search at the top of acq does nothing
Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.

After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.

To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 17:14:52 +02:00
Jonathan Druart
763d69732e Bug 7756: FIX send email for late orders
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- sending claim mails works now
- claim counter is not increased when vendor has no email address

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-12 16:50:27 +02:00
Paul Poulain
5483ec6204 missing \n in updatedatabase that causes some ugly display 2012-04-11 15:18:40 +02:00
Paul Poulain
5d4d33b22d Merge remote-tracking branch 'origin/new/bug_2780' 2012-04-11 09:34:48 +02:00
93ccaaf690 Bug 2780 [FOLLOW-UP] Capitalize strings consistently
Changes to the case of some hidden input values prevented
the user from being able to save a new SQL report.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, can now save sql reports.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-11 09:34:27 +02:00
Paul Poulain
1acf7a1fad members now passes perlcritic, but not misc. removing testing of misc 2012-04-10 18:03:55 +02:00
Paul Poulain
61d9d098e9 Updating euskara and french translation teams 2012-04-10 16:13:37 +02:00
Paul Poulain
c614ec3490 Bug 7935 follow-up: DBRev number 2012-04-10 15:26:55 +02:00
Katrin Fischer
47fac215af Bug 7935: Introduce sys pref to control 'browse results' in OPAC
Patch introduces a new system preference "OpacBrowseResults" to control
the feature for browsing and paging through results shown on top of the
left menu on detail pages in OPAC.

Preference is activated by default and can be deactivated using the
system preference.

To test:
 - Check database update works correctly
 - Check that browsing and paging still works with after database update
 - Deactivate the feature by setting 'OpacBrowseResults' to 'Disable'
 - Check the feature does no longer show up in OPAC
 - Check that a new installation also has the system preference with correct default

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-04-10 15:26:37 +02:00
Paul Poulain
5d9c7dfe04 Bug 2505 follow-up: C4::Ris not ready for use strict;use warnings;
The patch pushed a few hours ago is a good 1st step in the right direction.
however, many things are still to do to have the script OK with strict/warning, so commenting them

Errors if you have them:

Global symbol "$utf" requires explicit package name at C4/Ris.pm line 111.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 353.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 363.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 389.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 431.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 438.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 439.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 440.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 441.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 442.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 443.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 464.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 465.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 466.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 479.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 480.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 483.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 484.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 485.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 501.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 505.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 527.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 530.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 539.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 540.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 556.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 557.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 561.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 562.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 578.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 579.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 583.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 584.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 613.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 614.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 629.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 630.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 645.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 646.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 674.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 706.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 710.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 715.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 721.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 725.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 729.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 731.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 734.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 735.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 738.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 772.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 776.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 779.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 789.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 892.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 895.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 901.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 935.
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 962.
Global symbol "$uniout" requires explicit package name at C4/Ris.pm line 966.
C4/Ris.pm had compilation errors.
2012-04-10 15:08:47 +02:00
Paul Poulain
d8bac226cc Bug 5668 follow-up: removing empty lines in opac.pref
Those lines where introduced by this patch
2012-04-10 14:58:32 +02:00
Paul Poulain
3de47f3f90 Bug 5668 follow-up: DBRev number 2012-04-10 14:57:55 +02:00
7eef4c8c70 Bug 5668 - Star ratings in the opac
patch applied to commit eb3dc448d2

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

Turned on star ratings in the opac on details and results
Searched for titles - saw the stars
Clicked on a title
Clicked on the stars
Clicked on the stars to change my rating
Logged out
Tried to click on stars
Logged in as different user
Rated items that were rated already and saw average change
Changed preference to show only on detail and repeated tests
Changed preference to now show stars

All above tests passed. Signing off.

Rebased 3-19-12 by Ian Walls

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-04-10 14:40:49 +02:00