Commit Graph

17374 Commits

Author SHA1 Message Date
Paul Poulain d672f6ce3b Merge remote-tracking branch 'origin/new/bug_8945' into 3.10.x 2012-11-16 18:32:29 +01:00
Paul Poulain d6b7775c7e Merge remote-tracking branch 'origin/new/bug_8892' into 3.10.x 2012-11-16 18:31:04 +01:00
Paul Poulain bf404ffe51 Merge remote-tracking branch 'origin/new/bug_9054' into 3.10.x 2012-11-16 18:29:32 +01:00
Paul Poulain 1657214dec Merge remote-tracking branch 'origin/new/bug_9036' into 3.10.x 2012-11-16 18:29:13 +01:00
Paul Poulain ec0a973e32 Merge remote-tracking branch 'origin/new/bug_7119' into 3.10.x 2012-11-16 18:28:26 +01:00
Paul Poulain 42e65a97d4 Merge remote-tracking branch 'origin/new/bug_8915' into 3.10.x 2012-11-16 18:27:50 +01:00
Paul Poulain dcfde3f38f Merge remote-tracking branch 'origin/new/bug_9053' into 3.10.x 2012-11-16 18:18:39 +01:00
Nicole C. Engard 18012c7443 Bug 8945: Add missing acq help file
This adds the missing order from staged file help doc
to Koha.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:46:34 -05:00
Paul Poulain 702aa83952 Bug 8892 fix Plack scoping in acquisition
basket.pl has a local sub get_order_infos that require our-ing the
basketno variable.
Note that I had no problem with this variable. It may be some dead code,
but I couldn't be sure it is, so I just switched basketno to "our"

neworderempty.pl has 2 local sub that require our-ing some variables:
subs MARCfindbreeding and Load_Duplicate

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:44:27 -05:00
Jared Camins-Esakov 3ce177263b Bug 9054: 00-load should not try to load modules with optional dependencies
Prior to this patch, t/00-load.t was trying to load Koha::SearchEngine,
which fails when Moose is not installed.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:43:16 -05:00
Jared Camins-Esakov 8263f5bdb4 Merge branch 'bug_9036' into 3.12-master 2012-11-12 18:40:00 -05:00
Chris Nighswonger 2fda5d04c1 Bug 9036 - 00-load.t checks Koha::Cache::Memcached when it should not this patch adds code to skip this module during this test
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:39:36 -05:00
Christopher Nighswonger 78b1721144 Bug 7119 - tidy t/00-load.t
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 18:39:04 -05:00
Jared Camins-Esakov bc9c8c4124 Merge branch 'bug_8915' into 3.12-master 2012-11-12 10:04:42 -05:00
Jonathan Druart 58e1ea91a1 Bug 8915: Followup FIX QA issues
Before this patch:
* misc/maintenance/fix_mysql_constraints.pl                                FAIL
    pod                         FAIL
        *** ERROR: unterminated B<...>  in file misc/maintenance/fix_mysql_constraints.pl
    forbidden patterns          OK
    valid                       OK
    critic                      FAIL
        "require" statement with library name as string at line 25, column 12. Use a bareword instead.

+ I add a die on the open statement

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 10:03:39 -05:00
Frédéric Demians 0e8b11ac07 Bug 8915 A script fixing missing MySQL contraints
Help: fix_mysql_contraints.pl -h
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 10:03:16 -05:00
Jared Camins-Esakov 6456162544 Bug 9053: Test::MockModule and DBD::Mock should be required
Test::MockModule and DBD::Mock are required for the unit tests in t/
to run. This is good, but means they should be required.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-12 09:43:40 -05:00
Paul Poulain c283a6a6cd Merge remote-tracking branch 'origin/new/bug_7921' into 3.10.x 2012-11-12 14:45:25 +01:00
Paul Poulain 2892f80259 Merge remote-tracking branch 'origin/new/bug_8988' into 3.10.x 2012-11-12 14:44:00 +01:00
Paul Poulain 3ac2fc63d2 Merge remote-tracking branch 'origin/new/bug_8931' into 3.10.x 2012-11-12 14:27:46 +01:00
Paul Poulain ee1b3526dd Merge remote-tracking branch 'origin/new/bug_9010' into 3.10.x 2012-11-12 14:27:08 +01:00
Paul Poulain a7ad4aa440 Merge remote-tracking branch 'origin/new/bug_8989' into 3.10.x 2012-11-12 14:25:22 +01:00
Paul Poulain 7d00fcc7f5 Merge remote-tracking branch 'origin/new/bug_8972' into 3.10.x 2012-11-12 14:24:23 +01:00
Paul Poulain 2c3e313ff1 Merge remote-tracking branch 'origin/new/bug_8832' into 3.10.x 2012-11-12 14:23:14 +01:00
Paul Poulain 9a8d24b99b Merge remote-tracking branch 'origin/new/bug_8919' into 3.10.x 2012-11-12 14:22:15 +01:00
Paul Poulain 9d314a37e3 Merge remote-tracking branch 'origin/new/bug_9005' into 3.10.x 2012-11-12 14:21:44 +01:00
Paul Poulain e1ed00f17d Merge remote-tracking branch 'origin/new/bug_8784' into 3.10.x 2012-11-12 14:21:03 +01:00
Paul Poulain ff8b666e30 Merge remote-tracking branch 'origin/new/bug_8805' into 3.10.x 2012-11-12 14:20:28 +01:00
Jared Camins-Esakov c75cb8686c Bug 5490: smsoverdues.pl is an orphan
The script misc/cronjobs/smsoverdues.pl requires HTML::Template::Pro and
uses templates that do not exist in Koha. Since this has been true for
at least a year and a half, and no one is aware of anyone who is using
it, it seems prudent to remove the script so that no one is confused
and/or distressed by its non-functioning nature.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 21:43:53 -05:00
Jared Camins-Esakov a1bba47177 Merge branch 'bug_8996' into 3.12-master 2012-11-09 21:30:30 -05:00
Fridolyn SOMERS 24216136f4 Bug 8996: In result page items with negative notforloan are available
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 21:29:51 -05:00
Jared Camins-Esakov 25bc645c16 Merge branch 'bug_6428' into 3.12-master 2012-11-09 20:37:26 -05:00
Jared Camins-Esakov 8b3f78a5b9 Bug 6428: Increment version number
Database update for bug 6428 has been given version 3.09.00.064
2012-11-09 20:37:14 -05:00
Nuño López Ansótegui 6b14cd71f6 Bug 6428 - refered column 'items.coded_location_qualifier' does not exist
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:36:04 -05:00
Jared Camins-Esakov c254d0eb33 Merge branch 'bug_7921' into 3.12-master 2012-11-09 20:24:24 -05:00
Fridolyn SOMERS 1aeff203be Bug 7921: Software error while placing order
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:19:10 -05:00
Fridolyn SOMERS 33403b61d7 Bug 8988: item status uses authorized value description for intranet
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <M.de.Rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:13:15 -05:00
Jared Camins-Esakov 239a5f76cb Merge branch 'bug_8931' into 3.12-master 2012-11-09 20:08:49 -05:00
Owen Leonard 6f69e809b4 Bug 8931 [Follow-up] submit buttons have blue background
This follow-up removes the white background from fieldsets
with class "action" when they are embedded inside another
fieldset (Comment 4).

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:08:23 -05:00
Marc Veron 6812cc14b5 Bug 9010 - Follou up Quote of the day: Umlauts do not display correctly
After applying Serhij's patch I had still troubles with umlauts, e.g. while editing or adding a new quote.

Added explicit utf-8 encoding at 3 places.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:02:11 -05:00
Serhij Dubyk {Сергій Дубик} 0680433872 Bug 9010 - Quote of the day: Umlauts do not display correctly Added utf8-encoding in json-header for correct view quotes in quotes editor.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-09 20:01:44 -05:00
Jared Camins-Esakov 736baf6ade Merge branch 'bug_8832' into 3.12-master 2012-11-08 23:23:52 -05:00
Jared Camins-Esakov 06016055c6 Bug 8832: Increment version number
Database update for bug 8832 has been given version 3.09.00.063
2012-11-08 23:23:46 -05:00
Owen Leonard 1bf83bae84 Bug 8989 - Availability facet needs an id
This patch adds an id to the <li> which contains
the "limit to available" facet in the OPAC and
staff client.

To test, add custom CSS for the staff client and
OPAC to hide the id "availability_facet" and
confirm that the link is no longer visible.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:23:25 -05:00
Owen Leonard 2a73ced61d Bug 8972 - Due Date set to 100 years ago
In order to prevent submission of dates with ambiguous two-digit
years this patch makes date-due input fields read-only so that
users must use date/time picker.

Other minor fixes:

- Adding missing labels
- Adding common class wrapper to datepicker for checkout and renewal
- Correcting focus handling on "specify due date" field (should
  focus on barcode field after a date has been selected).
- Removing trailing comma from JavaScript (breaks IE)

To test, try typing an invalid number in any of the date due entry
fields: Under 'specify due date,' 'renewal due date,' or the
confirm "invalid" date dialog (after specifying a date in the past).
Manual entry should not work. Choosing a date/time using the
widget should work.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:23:25 -05:00
Owen Leonard ca9f182601 Bug 8972 - Due Date set to 100 years ago
In order to prevent submission of dates with ambiguous two-digit
years this patch makes date-due input fields read-only so that
users must use date/time picker.

Other minor fixes:

- Adding missing labels
- Adding common class wrapper to datepicker for checkout and renewal
- Correcting focus handling on "specify due date" field (should
  focus on barcode field after a date has been selected).
- Removing trailing comma from JavaScript (breaks IE)

To test, try typing an invalid number in any of the date due entry
fields: Under 'specify due date,' 'renewal due date,' or the
confirm "invalid" date dialog (after specifying a date in the past).
Manual entry should not work. Choosing a date/time using the
widget should work.

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:14:39 -05:00
Jonathan Druart 3ca887bed2 Bug 8832: Update the gist pref and hide the tax rate value if not needed
The gist system preference will be updated with the existing values and
with the supplier's gstrate values.
The "Tax rate" part becomes hidden if the syspref is not filled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:12:09 -05:00
Owen Leonard 79262f4502 Bug 8989 - Availability facet needs an id
This patch adds an id to the <li> which contains
the "limit to available" facet in the OPAC and
staff client.

To test, add custom CSS for the staff client and
OPAC to hide the id "availability_facet" and
confirm that the link is no longer visible.

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 23:06:13 -05:00
Jared Camins-Esakov 92bdb73677 Merge branch 'bug_9005' into 3.12-master 2012-11-08 12:47:04 -05:00
Dobrica Pavlinusic 24125d4be3 Bug 8919 - ExtendedPatronAttributes not populated from LDAP
Current code is overly complex and assumes that
C4::Members::AttributeTypes::GetAttributeTypes
returns array of attribute codes which is not true.

Instead it return array of hashes so none of extended attributes
will be replicated from LDAP.

This code correctly extracts extended attributes from borrower data
provides simpler code which fills same structure.

It also skips empty values (" ") which are result of mapping without
any default value. This is needed to make unique extended patron values
work. If not handled it would insert empty value for first user and
fail for all others on uniqueness constraint.

Test scenario:

1. define Patron attribute types in administration
2. define mapping from LDAP fields to attributes in koha-conf.xml
3. login as new user with LDAP fields and verify that extended
   attributes are replicated from LDAP

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Passed-QA-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-08 12:42:52 -05:00