koha.git
8 years agoBug 5549 Followup: fix suspension in days
Ian Walls [Wed, 21 Mar 2012 20:03:32 +0000 (16:03 -0400)]
Bug 5549 Followup: fix suspension in days

ISO dates were being compared with DateTime objects, and DateTime::Durations
with integers.  This patch reimplements the _FixFineDaysOnReturn subroutine
to use the new hourly loans functionality.

Also moves date formatting of patron debar date out of circ/returns.pl and into
KohaDates on the template

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 5549 : fixed undefined subroutine format_date in circ/returns.pl by adding full...
root [Wed, 21 Mar 2012 10:57:10 +0000 (05:57 -0500)]
Bug 5549 : fixed undefined subroutine format_date in circ/returns.pl by adding full path of C4::Dates::format_date()

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 5549 : _FixFineDaysOnReturn was using C4::Dates in calling
Chris Cormack [Tue, 20 Mar 2012 22:09:51 +0000 (11:09 +1300)]
Bug 5549 :  _FixFineDaysOnReturn was using C4::Dates in calling
days_between, fixed to use DateTime objects

8 years agoBug 5549 : Fixing typo in C4/Circulation.pm
Chris Cormack [Tue, 20 Mar 2012 19:33:26 +0000 (08:33 +1300)]
Bug 5549 : Fixing typo in C4/Circulation.pm

days_between not daysBetween

8 years agoBug 5549 : fixed non-cloned date object in Add date for calendar, also removed erouno...
Elliott Davis [Mon, 19 Mar 2012 21:56:44 +0000 (16:56 -0500)]
Bug 5549 : fixed non-cloned date object in Add date for calendar, also removed erounous dumper in moremember.pl that dumped entire issue

8 years agoBug 5549 : fixed datetime issue so time is shown in output for circulation.pl and...
Elliott Davis [Mon, 19 Mar 2012 20:24:51 +0000 (15:24 -0500)]
Bug 5549 : fixed datetime issue so time is shown in output for circulation.pl and moremember.pl

8 years agoBug 5549 : Fixing link to calendar
Chris Cormack [Sun, 29 Jan 2012 19:39:02 +0000 (13:39 -0600)]
Bug 5549 : Fixing link to calendar

8 years agoBug 5549 : Fixing the opac-pref
Elliott Davis [Tue, 18 Oct 2011 08:20:14 +0000 (03:20 -0500)]
Bug 5549 : Fixing the opac-pref

8 years agoBug 5549 : fixed clone issue in moremember
Elliott Davis [Wed, 19 Oct 2011 21:02:40 +0000 (21:02 +0000)]
Bug 5549 : fixed clone issue in moremember

8 years agoBug 5549 : fixed save in smart-rules
Elliott Davis [Wed, 19 Oct 2011 20:23:27 +0000 (20:23 +0000)]
Bug 5549 : fixed save in smart-rules

8 years agoBug 5549 : added dropdown for new rule
Elliott Davis [Tue, 18 Oct 2011 09:11:57 +0000 (09:11 +0000)]
Bug 5549 : added dropdown for new rule

8 years agoBug 5549 : fixed typo
Elliott Davis [Tue, 18 Oct 2011 08:59:55 +0000 (08:59 +0000)]
Bug 5549 : fixed typo

8 years agoBug 5549 : added select option in circ rules for unit
Elliott Davis [Tue, 18 Oct 2011 08:56:12 +0000 (08:56 +0000)]
Bug 5549 : added select option in circ rules for unit

8 years agoBug 5549 - Another typo fix
Chris Cormack [Wed, 17 Aug 2011 23:23:08 +0000 (11:23 +1200)]
Bug 5549 - Another typo fix

8 years agoBug 5549 : Fixed bracketing error
Elliott Davis [Wed, 17 Aug 2011 17:02:00 +0000 (12:02 -0500)]
Bug 5549 : Fixed bracketing error

8 years agoBug 5549 - Hourly Loans - Fixing a typo
Chris Cormack [Tue, 16 Aug 2011 22:59:15 +0000 (10:59 +1200)]
Bug 5549 - Hourly Loans - Fixing a typo

8 years agoBug 6430 - DB changes needed to support hourly circ
Chris Cormack [Tue, 31 May 2011 01:35:14 +0000 (13:35 +1200)]
Bug 6430 - DB changes needed to support hourly circ

Changing columns to datetime instead of date

Squashed commit of the following:

commit ccf37880eaf660685d439b000298dcc025e78b6e
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Thu May 26 12:06:24 2011 +1200

    Bug 5549 backing out of decision to change the name of the colums

commit 2e326fdec7d768fe93d41e93abf3ca665a363791
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Tue May 24 14:31:26 2011 +1200

    Bug 5549 : Starting work on hourly loans, changing issues table

8 years agoBug 5549 : CalcFine was corrupting due date
Colin Campbell [Tue, 5 Jul 2011 15:44:16 +0000 (16:44 +0100)]
Bug 5549 : CalcFine was corrupting due date

Clone the passed duedate as the addition of days was
corrupting it in calling context causing new account recs
to be written rather than updating the existing

8 years agoBug 5549 : Refactor fines.pl
Colin Campbell [Thu, 30 Jun 2011 16:04:36 +0000 (17:04 +0100)]
Bug 5549 : Refactor fines.pl

Clean code in fines to remove unnecessary complexity
remove constructs now thought suspect or
not good pracrice

8 years agoBug 5549 : use DateUtils routine for formatting sql date
Colin Campbell [Fri, 24 Jun 2011 13:39:12 +0000 (14:39 +0100)]
Bug 5549 : use DateUtils routine for formatting sql date

Also cleanup modules list to reflect those
actually used

8 years agoBug 5549 : Koha::Calendar::addDate should not loop on -1
Colin Campbell [Fri, 24 Jun 2011 13:28:22 +0000 (14:28 +0100)]
Bug 5549 : Koha::Calendar::addDate should not loop on -1

Control variable of loop should be absolute value
to avoid looping when backtracking

8 years agoBug 5549 : Fix 'specify due date'
Colin Campbell [Fri, 24 Jun 2011 10:05:54 +0000 (11:05 +0100)]
Bug 5549 : Fix 'specify due date'

If due date is set generate a proper DateTime object
for issue procesing

8 years agoBug 5549 : returns calling wrong format routine on date
Colin Campbell [Thu, 23 Jun 2011 14:13:04 +0000 (15:13 +0100)]
Bug 5549 : returns calling wrong format routine on date

We don't have an orm yet

8 years agoBug 5549 : Daily loans should be due at 23:59
Colin Campbell [Thu, 23 Jun 2011 13:11:48 +0000 (14:11 +0100)]
Bug 5549 : Daily loans should be due at 23:59

This was failing in one patch through CalcDueDate

8 years agoBug 5549 : circ/returns needs to import DateUtils
Colin Campbell [Thu, 23 Jun 2011 11:25:55 +0000 (12:25 +0100)]
Bug 5549 : circ/returns needs to import DateUtils

8 years agoBug 5549 Fix a couple of comparisons in C4::Circulation
Colin Campbell [Thu, 23 Jun 2011 11:10:51 +0000 (12:10 +0100)]
Bug 5549 Fix a couple of comparisons in C4::Circulation

Changed a string comparison called on an integer
Deal with case where value is not set without runtime warnings

8 years agoBug 5549 : Format due dates in opac
Colin Campbell [Thu, 23 Jun 2011 10:58:09 +0000 (11:58 +0100)]
Bug 5549 : Format due dates in opac

Further change to ensure that where dates are formatted from the
db form the duedate loses the 23:59

8 years agoBug 5549 : Don't confuse the users with an irrelevant time
Colin Campbell [Thu, 23 Jun 2011 10:35:35 +0000 (11:35 +0100)]
Bug 5549 : Don't confuse the users with an irrelevant time

If the book is due at 23:59 the due time is irrelevant
and potentially confusing to the user add a DateUtils
routine that strips that off the returned display date

8 years agoBug 5549 : move rollingloans.t to db_dependent tests
Colin Campbell [Thu, 23 Jun 2011 10:05:00 +0000 (11:05 +0100)]
Bug 5549 : move rollingloans.t to db_dependent tests

This still needs a followup to make the tests pass with sample data

8 years agoBug 5549 : Calendar needed a change array_ref to hash_ref
Colin Campbell [Thu, 23 Jun 2011 08:39:38 +0000 (09:39 +0100)]
Bug 5549 : Calendar needed a change array_ref to hash_ref

8 years agoBug 5549 : Koha::Calendar needs to accept scalar add_durations
Colin Campbell [Wed, 22 Jun 2011 23:39:26 +0000 (00:39 +0100)]
Bug 5549 : Koha::Calendar needs to accept scalar add_durations

8 years agoBug 5549 : Make Koha::Calendar testable
Colin Campbell [Wed, 22 Jun 2011 23:06:29 +0000 (00:06 +0100)]
Bug 5549 : Make Koha::Calendar testable

Add a testing option
Add a script with tests
Some simplifications of the logic

8 years agoBug 5549 : Fix typo in renewscript
Colin Campbell [Wed, 22 Jun 2011 17:02:36 +0000 (18:02 +0100)]
Bug 5549 : Fix typo in renewscript

8 years agoBug 5549 : Show time due in opac-detail
Colin Campbell [Wed, 22 Jun 2011 16:58:25 +0000 (17:58 +0100)]
Bug 5549 : Show time due in opac-detail

8 years agoBug 5549 : Add Returned, checkout out time to Patron Circ History
Colin Campbell [Wed, 22 Jun 2011 16:48:30 +0000 (17:48 +0100)]
Bug 5549 : Add Returned, checkout out time to Patron Circ History

8 years agoBug 5549 : Fix a couple of date issues from testing
Colin Campbell [Wed, 22 Jun 2011 16:30:34 +0000 (17:30 +0100)]
Bug 5549 : Fix a couple of date issues from testing

8 years agoBug 5549 : Add Extra Perl Dependencies
Colin Campbell [Wed, 22 Jun 2011 09:15:30 +0000 (10:15 +0100)]
Bug 5549 : Add Extra Perl Dependencies

Add:
  DateTime::Timezone
  DateTime::Format::DateParse
  DateTime::Set
  DateTime::Event::ICal
  Readonly
  Readonly::XS

8 years agoBug 5549 : Add script to convert issue_dates
Colin Campbell [Tue, 21 Jun 2011 14:06:51 +0000 (15:06 +0100)]
Bug 5549 : Add script to convert issue_dates

8 years agoBug 5549 : Overdues : Handle some date comparison and display issues
Colin Campbell [Tue, 21 Jun 2011 13:07:41 +0000 (14:07 +0100)]
Bug 5549 : Overdues : Handle some date comparison and display issues

8 years agoBug 5549 : Sip scripts should handle dt due dates
Colin Campbell [Tue, 21 Jun 2011 11:11:05 +0000 (12:11 +0100)]
Bug 5549 : Sip scripts should handle dt due dates

8 years agoBug 5549 : Let Timestamp do the right thing if passed a DateTime
Colin Campbell [Tue, 21 Jun 2011 10:08:20 +0000 (11:08 +0100)]
Bug 5549 : Let Timestamp do the right thing if passed a DateTime

8 years agoBug 5549 : replace curdate with now in a couple of sql lines
Colin Campbell [Mon, 20 Jun 2011 14:48:57 +0000 (15:48 +0100)]
Bug 5549 : replace curdate with now in a couple of sql lines

duedate is now datetime and comparing with curdate
causes a system error

8 years agoBug 5549 : Fix calculation of duedates in fines.pl and advance_notices.pl
Colin Campbell [Mon, 20 Jun 2011 14:47:10 +0000 (15:47 +0100)]
Bug 5549 : Fix calculation of duedates in fines.pl and advance_notices.pl

Cleaned up some no longer used parameters in
Overdues::CalcFine

8 years agoBug 5549 : Add days_between method to Koha::Calendar
Colin Campbell [Mon, 20 Jun 2011 11:08:14 +0000 (12:08 +0100)]
Bug 5549 : Add days_between method to Koha::Calendar

8 years agoBug 5549 : Format Date in ILSDI::Services to include hhmm
Colin Campbell [Mon, 20 Jun 2011 09:22:04 +0000 (10:22 +0100)]
Bug 5549 : Format Date in ILSDI::Services to include hhmm

8 years agoBug 5549 : Duedate formatting : reserves and opac
Colin Campbell [Fri, 17 Jun 2011 15:34:46 +0000 (16:34 +0100)]
Bug 5549 : Duedate formatting : reserves and opac

8 years agoBug 5549: Formatting duedates in catalogue scripts
Colin Campbell [Fri, 17 Jun 2011 14:02:46 +0000 (15:02 +0100)]
Bug 5549: Formatting duedates in catalogue scripts

8 years agoBug 5549 : DateUtils add subroutine format_sqldatetime
Colin Campbell [Fri, 17 Jun 2011 13:46:35 +0000 (14:46 +0100)]
Bug 5549 : DateUtils add subroutine format_sqldatetime

convenience method for a frequent use of the other
methods in the module

8 years agoBug 5549 : Format date with hh:mm in branchoverdues
Colin Campbell [Fri, 17 Jun 2011 12:02:10 +0000 (13:02 +0100)]
Bug 5549 : Format date with hh:mm in branchoverdues

Also removed am unused date string

8 years agoBug 5549 : Cannot use CUR_DATE on date_due column
Colin Campbell [Fri, 17 Jun 2011 11:13:47 +0000 (12:13 +0100)]
Bug 5549 : Cannot use CUR_DATE on date_due column

Comparison of CUR_TIME() & datetime gives
table corrupted error in mysql
Plus we want to see hourly loans

8 years agoBug 5549 : overdues display should be hours mins aware
Colin Campbell [Fri, 17 Jun 2011 10:32:50 +0000 (11:32 +0100)]
Bug 5549 : overdues display should be hours mins aware

8 years agoBug 5549 : GetPendingIssues now returns DateTime objects
Colin Campbell [Thu, 16 Jun 2011 15:45:02 +0000 (16:45 +0100)]
Bug 5549 : GetPendingIssues now returns DateTime objects

Show due times in addition to dates in using screens

8 years agoBug 5549 : Only use DateTime for issues table
Colin Campbell [Thu, 16 Jun 2011 09:40:18 +0000 (10:40 +0100)]
Bug 5549 : Only use DateTime for issues table

Tidied up the module list
Removed an used subroutine
Replaced some old C4::Dates code with DateTime calls

8 years agoBug 5549 : Handle datetimes on return
Colin Campbell [Thu, 16 Jun 2011 09:10:09 +0000 (10:10 +0100)]
Bug 5549 : Handle datetimes on return

8 years agoBug 5549 : DateUtils handling odd cases
Colin Campbell [Wed, 15 Jun 2011 12:44:06 +0000 (13:44 +0100)]
Bug 5549 : DateUtils handling odd cases

Really we should not have them but they are in
existing code. They were not handled 100%
added appropriate tests

8 years agoBug 5549 : Merge old and new DateUtils tests
Colin Campbell [Wed, 15 Jun 2011 11:53:13 +0000 (12:53 +0100)]
Bug 5549 : Merge old and new DateUtils tests

8 years agoBug 5549 : Add Koha directory to testcritic
Colin Campbell [Wed, 15 Jun 2011 10:29:11 +0000 (11:29 +0100)]
Bug 5549 : Add Koha directory to testcritic

8 years agoBug 5549 : Add Tests For Koha::DateUtils
Colin Campbell [Wed, 15 Jun 2011 10:18:38 +0000 (11:18 +0100)]
Bug 5549 : Add Tests For Koha::DateUtils

Add testscript for DateUtils
Add a parameter to override system pref to output_pref not for
use in calling software (its superfluous) but to enable testing
of call with different settings

8 years agoBug 5549 : Need a testscript for rolling loans
Colin Campbell [Wed, 15 Jun 2011 09:17:42 +0000 (10:17 +0100)]
Bug 5549 : Need a testscript for rolling loans

Note from Chris C:
This needs to be changed to work with the sample data, follow up to be
done

8 years agoBug 5549 : GetPendingIssues now returns duedate as a DateTime object
Colin Campbell [Tue, 14 Jun 2011 15:45:32 +0000 (16:45 +0100)]
Bug 5549 : GetPendingIssues now returns duedate as a DateTime object

Change the handling/formatting of duedate in those
scripts calling it

8 years agoBug 5549 : Get basic 24 Hr loan working
Colin Campbell [Tue, 14 Jun 2011 14:32:27 +0000 (15:32 +0100)]
Bug 5549 : Get basic 24 Hr loan working

8 years agoBug 5549 : Pass time_zone correctly
Colin Campbell [Tue, 14 Jun 2011 12:57:44 +0000 (13:57 +0100)]
Bug 5549 : Pass time_zone correctly

8 years agoBug 5549 : Koha::Calendar allow negative offset to addDate
Colin Campbell [Mon, 13 Jun 2011 15:31:46 +0000 (16:31 +0100)]
Bug 5549 : Koha::Calendar allow negative offset to addDate

8 years agoBug 5549 : Due Date calculation in issue needs to be HH:MM aware
Colin Campbell [Wed, 8 Jun 2011 13:03:33 +0000 (14:03 +0100)]
Bug 5549 : Due Date calculation in issue needs to be HH:MM aware

8 years agoBug 5549 : Add DateUtils Module
Colin Campbell [Wed, 8 Jun 2011 11:55:33 +0000 (12:55 +0100)]
Bug 5549 : Add DateUtils Module

Wraps DateTime object creation from a string
as a tool to enable move to dt objects for more
flexibility

8 years agoBug 5549 : Add a timezone object to C4::Context
Colin Campbell [Tue, 24 May 2011 14:00:33 +0000 (15:00 +0100)]
Bug 5549 : Add a timezone object to C4::Context

Will be required by rolling loans to get correct times
NB the setting of the TZ in mysql has not been changed as
this appears to rely on $ENV{TZ} being undefined

8 years agoBug 5549 : Allow hourly loans to be indicated in the loan rules
Colin Campbell [Tue, 7 Jun 2011 14:16:00 +0000 (15:16 +0100)]
Bug 5549 : Allow hourly loans to be indicated in the loan rules

Add a column indicating whether we are talking days or hours here
This work is merely a holding version pending a better version

8 years agoBug 5596 [REVISED 2] add author to holds to pull report
Owen Leonard [Wed, 14 Mar 2012 14:46:17 +0000 (10:46 -0400)]
Bug 5596 [REVISED 2] add author to holds to pull report

Adding output of author.

Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7301: 'From' field is 1 year ago by default
Jonathan Druart [Wed, 22 Feb 2012 15:30:40 +0000 (16:30 +0100)]
Bug 7301: 'From' field is 1 year ago by default

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7400: Add auto-completion on auth_finder
Matthias Meusburger [Wed, 4 Jan 2012 14:11:03 +0000 (15:11 +0100)]
Bug 7400: Add auto-completion on auth_finder

While typing an authority, will automatically propose authorities (similar to
autocompletion for patron search if activated)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested searching for authorities with and without autocomplete. Note that
this is most useful when used in the "Main entry" box instead of the
"Main entry ($a only)" box.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected tabs to spaces in auth-finder-search.inc while resolving merge
conflict.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7477: Followup: Fix perlcritic issues
Jonathan Druart [Thu, 8 Mar 2012 11:41:13 +0000 (12:41 +0100)]
Bug 7477: Followup: Fix perlcritic issues

Signed-off-by: Srdjan Jankovic <srdjan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
An existing holiday in a branch is not deleted when the branch is overwritten:
* branch B, set today as closed
* switch to branch A, where today is not closed
* copy holidays to branch B
* today is still closed for branch B

That's important to notice for the documentation

8 years agoBug 7477: Copy holidays from one branch to another
Srdjan Jankovic [Fri, 10 Feb 2012 00:09:56 +0000 (13:09 +1300)]
Bug 7477: Copy holidays from one branch to another

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 7668 - Improve navigation and toolbar options in guided reports
Owen Leonard [Wed, 7 Mar 2012 19:06:45 +0000 (14:06 -0500)]
Bug 7668 - Improve navigation and toolbar options in guided reports

Creating new include, reports-toolbar.inc for presenting "action"
options to the user, in contrast with "view" options in the left-
hand navigation menu.

In the toolbar: New (guided report, SQL report), Edit, Run.

The presence of the toolbar allows the user to access functions
more flexibly: Getting directly to 'edit' or 'run' from the 'view'
page for instance.

Modifications to guided_reports.pl pass report id and name to
the template for clarity and for the purpose of enabling the
edit/run buttons.

To test: Apply the patch and go through the process of creating
a new saved SQL report. Note that the toolbar is present and
the buttons are functional at appropriate times.

New and Edit options should only be displayed if the user has
permission to create reports. Test with a user who does not
have create permission to confirm.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agobug_7140: Added item description to complement icon to search result and biblio detai...
Srdjan Jankovic [Fri, 27 Jan 2012 03:59:27 +0000 (16:59 +1300)]
bug_7140: Added item description to complement icon to search result and biblio detail pages

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This seems like a very big improvement, especially for people using screen
readers. I agree that the change to C4::Search is required.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoC4::Members follow-up
Paul Poulain [Thu, 9 Feb 2012 16:42:53 +0000 (17:42 +0100)]
C4::Members follow-up

Overdues already loaded, must set full sub patch

http://bugs.koha-community.org/show_bug.cgi?id=6875
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Fixes issue with circ/branchoverdues.pl
Passes tests.

8 years agoBug 6296 follow-up: DBrev
Paul Poulain [Mon, 19 Mar 2012 16:37:31 +0000 (17:37 +0100)]
Bug 6296 follow-up: DBrev

8 years agoBug 6296: allow users to be authenticated by SSL client certs
Robin Sheat [Thu, 9 Jun 2011 03:11:23 +0000 (15:11 +1200)]
Bug 6296: allow users to be authenticated by SSL client certs

This adds a new syspref: AllowPKIAuth. It can have one of three states:
* None
* Common Name
* emailAddress

If a) this is set to something that's not "None", and b) the webserver
is passing SSL client cert details on to Koha, then the relevant field
in the user's certificate will be matched up against the field in the
database and they will be automatically logged in. This is used as a
secure form of single sign-on in some organisations.

The "Common Name" field is matched up against the userid, while
"emailAddress" is matched against the primary email.

This is an example of what might go in the Apache configuration for the
virtual host:

    #SSLVerifyClient require # only allow PKI authentication
    SSLVerifyClient optional
    SSLVerifyDepth 2
    SSLCACertificateFile /etc/apache2/ssl/test/ca.crt
    SSLOptions +StdEnvVars

The last line ensures that the required details are
passed to Koha.

To test the PKI authentication, use the following curl command:
    curl -k --cert client.crt --key client.key  https://URL/
(look through the output to find the "Welcome," line to indicate that a user
has been authenticated or the "Log in to Your Account" to indicate that a
user has not been authenticated)

To create the certificates needed for the above command, the following series
of commands will work:
    # Create the CA Key and Certificate for signing Client Certs
    openssl genrsa -des3 -out ca.key 4096
    openssl req -new -x509 -days 365 -key ca.key -out ca.crt
    # This is the ca.crt file that the Apache config needs to know about,
    # so put the file at /etc/apache2/ssl/test/ca.crt

    # Create the Server Key, CSR, and Certificate
    openssl genrsa -des3 -out server.key 1024
    openssl req -new -key server.key -out server.csr

    # We're self signing our own server cert here.  This is a no-no in
    # production.
    openssl x509 -req -days 365 -in server.csr -CA ca.crt -CAkey ca.key \
        -set_serial 01 -out server.crt

    # Create the Client Key and CSR
    openssl genrsa -des3 -out client.key 1024
    openssl req -new -key client.key -out client.csr

    # Sign the client certificate with our CA cert. Unlike signing our own
    # server cert, this is what we want to do.
    openssl x509 -req -days 365 -in client.csr -CA ca.crt -CAkey ca.key \
        -set_serial 02 -out client.crt
    openssl pkcs12 -export -in client.crt -inkey client.key -out client.p12
    # In theory we can install this client.p12 file in Firefox or Chrome, but
    # the exact steps for doing so are unclear, and outside the scope of this
    # patch

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested with Common Name and E-mail authentication, as well as with PKI
authentication disabled. Regular logins continue to work in all cases when
SSL authentication is set to optional on the server.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA comment: synchronized updatedatabase.pl version of syspref with sysprefs.sql
version, to avoid divergent databases between new and upgrading users.

8 years agoMerge remote-tracking branch 'origin/new/bug_7408'
Paul Poulain [Mon, 19 Mar 2012 15:55:25 +0000 (16:55 +0100)]
Merge remote-tracking branch 'origin/new/bug_7408'

8 years agoBug 7408 Fix ExpireReservesMaxPickUpDelayCharge syspref definition
Frédéric Demians [Fri, 16 Mar 2012 18:52:17 +0000 (19:52 +0100)]
Bug 7408 Fix ExpireReservesMaxPickUpDelayCharge syspref definition

Allow preferences translation

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
This patch fixes another sysprefs problem -
Syck parser (line 300, column -1): syntax error at /usr/lib/perl5/YAML/Syck.pm line 76, <$fh> line 1.
when clicking local use. I could not verify that it fixed translations, but fixing the local use prefs is important too, so I'm signing off.

8 years agoBug 4976 - Status of item returned with process_koc.pl is empty in Intranet
Kyle M Hall [Fri, 9 Mar 2012 21:34:47 +0000 (16:34 -0500)]
Bug 4976 - Status of item returned with process_koc.pl is empty in Intranet

Fix to ensure items returned through a processed koc file have
items.onloan and items.datelastseen set corrrectly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Uploaded a file with checked in and checked out items. all info
shows properly.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5698: Followup: Add date picker option to SQL Runtime Parameters
Jonathan Druart [Fri, 16 Mar 2012 10:36:46 +0000 (11:36 +0100)]
Bug 5698: Followup: Add date picker option to SQL Runtime Parameters

Move html

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5698: Add date picker option to SQL Runtime Parameters
Ian Walls [Sat, 10 Mar 2012 14:03:20 +0000 (09:03 -0500)]
Bug 5698: Add date picker option to SQL Runtime Parameters

Adds a date picker for SQL reports with the 'date' authorised_value.  Updates help
documentation for this new feature, as well.

To test:
1.  Create a new report with two date parameters, using the syntax:
<<Label for this selection of date|date>>
2.  Run the report
3.  Select dates
4.  The SQL generated should format the dates properly in ISO, and keep track of which
date is which

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 7670 - make required fields red
Owen Leonard [Thu, 8 Mar 2012 13:53:45 +0000 (08:53 -0500)]
Bug 7670 - make required fields red

Adding "required" style and "Required" note to additem fields,
consistent with the way required fields are displayed
on the add patron form.

This patch also corrects an error in the client-side validation
script which misidentified which fields were required. Leaving
a required field empty should result in an alert and the missing
field being highlighted in yellow.

To test, open the add item form on a record which uses
a framework in which one or more item fields are required.
Required fields should be labeled in red and appended with a
"Required" note.

Submit the form while some required fields are empty. You should
see a javascript alert. The empty mandatory fields should have
a yellow background.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Works - passes tests.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7656 - "undefined" pop-up message when putting hold on reference item
Kyle M Hall [Tue, 6 Mar 2012 19:08:04 +0000 (14:08 -0500)]
Bug 7656 - "undefined" pop-up message when putting hold on reference item

This is a single line fix. Initializing the msg var to an empty
string solves the problem.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agowelcome David Cook, you're 178th
Paul Poulain [Fri, 16 Mar 2012 10:54:13 +0000 (11:54 +0100)]
welcome David Cook, you're 178th

8 years agoBug 7618 Escape HTML special characters for SQL displayed above results in Report...
David [Mon, 12 Mar 2012 23:17:32 +0000 (10:17 +1100)]
Bug 7618 Escape HTML special characters for SQL displayed above results in Report module

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7368'
Paul Poulain [Fri, 16 Mar 2012 10:50:42 +0000 (11:50 +0100)]
Merge remote-tracking branch 'origin/new/bug_7368'

8 years ago7368 Typo in cart_to_shelf
Marcel de Rooy [Mon, 12 Mar 2012 11:33:07 +0000 (12:33 +0100)]
7368 Typo in cart_to_shelf

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7644 - Invalid markup in staff client language chooser
Owen Leonard [Mon, 5 Mar 2012 19:47:51 +0000 (14:47 -0500)]
Bug 7644 - Invalid markup in staff client language chooser

This patch removes invalid markup from the language chooser
in the intranet. It also copies the markup and style of
the staff client include to the OPAC so the two are
more consistent. I hope that will make future changes
and debugging a little easier.

I believe this patch also fixes Bug 7366, "Language chooser
display problems."

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes bug 7366, but there is still a difference between staff
and OPAC.
Installed languages: en, en-NZ, de-DE, fr-FR
Activated langauges: en, en-NZ, fr-FR
OPC shows English, staff shows en-NZ as label for the list.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7557 follow-up: DBRev number and removed default value
Paul Poulain [Wed, 14 Mar 2012 15:38:07 +0000 (16:38 +0100)]
Bug 7557 follow-up: DBRev number and removed default value

See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7557#c17,
this follow-up also remove the default value for the syspref

8 years agoBug 7557: Change hardcoded routing list note into a system preference
Katrin Fischer [Sun, 19 Feb 2012 11:31:14 +0000 (12:31 +0100)]
Bug 7557: Change hardcoded routing list note into a system preference

Adds a new system preference RoutingListNote under the Serials tab.

The note will display above the note from the subscription and replace
the current hardcoded note:

"Notes: Please return this item promptly as others are waiting for it."

The patch adds unique ids to all notes and the note in general, so it
can be styled using CSS.

Also corrects the routing slip template to follow the HTML4 rule.

Update 2012-03-12: Fixed problem in updatedatebase.

8 years agoMerge remote-tracking branch 'origin/new/bug_6875'
Paul Poulain [Wed, 14 Mar 2012 15:16:21 +0000 (16:16 +0100)]
Merge remote-tracking branch 'origin/new/bug_6875'

8 years agoBug 6875 Followup: De-nesting C4::Items breaks bulkmarcimport
Ian Walls [Sat, 10 Mar 2012 13:02:26 +0000 (08:02 -0500)]
Bug 6875 Followup: De-nesting C4::Items breaks bulkmarcimport

Removing 'use C4::Branch' in favour of a subroutine-specific 'require C4::Branch'
causes the GetBranchName subroutine to return an error, as it's not defined
in C4::Items.  Adding "C4::Branch::" scoping fixes the error, which is what's done here.

To confirm problem:
1.  Attempt to run bulkmarcimport.pl before applying the patch.  You should get
    ERROR: Adding items to bib 435 failed: Undefined subroutine &C4::Items::GetBranchName
    called at /home/sekjal/kohaclone/C4/Items.pm line 656, <GEN13> line 435.

To test:
2.  apply patch
3.  run bulkmarcimport again.  Error should disappear.

Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Note that this problem only appears when importing records with item (952)
fields.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 5749 Fix borrower address display in intranet
Stéphane Delaune [Tue, 6 Mar 2012 15:20:01 +0000 (16:20 +0100)]
Bug 5749 Fix borrower address display in intranet

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoMerge remote-tracking branch 'origin/new/bug_7661'
Paul Poulain [Wed, 14 Mar 2012 14:00:50 +0000 (15:00 +0100)]
Merge remote-tracking branch 'origin/new/bug_7661'

8 years ago7661 Followup for resolving moved Record test
Marcel de Rooy [Wed, 14 Mar 2012 12:39:53 +0000 (13:39 +0100)]
7661 Followup for resolving moved Record test

8 years agoMerge remote-tracking branch 'origin/new/bug_7031'
Paul Poulain [Wed, 14 Mar 2012 13:47:34 +0000 (14:47 +0100)]
Merge remote-tracking branch 'origin/new/bug_7031'

8 years agoBug 7031 follow-up typo fix & tab removed
Paul Poulain [Wed, 14 Mar 2012 13:47:21 +0000 (14:47 +0100)]
Bug 7031 follow-up typo fix & tab removed

* s/adsearch/advsearch/ as it was a typo
* replaced tab by 4 spaces

8 years ago7031 Followup: typo
Marcel de Rooy [Fri, 9 Mar 2012 16:49:29 +0000 (17:49 +0100)]
7031 Followup: typo

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
8 years agoBug 7031 Follow-up, More options for AdvancedSearchTypes
Owen Leonard [Tue, 27 Dec 2011 16:18:34 +0000 (11:18 -0500)]
Bug 7031 Follow-up, More options for AdvancedSearchTypes

This follow-up patch corrects some markup errors and removes some
markup which I think is superfluous:

- Using template FILTER command to remove invalid punctuation from
  ID attributes (to quiet the HTML validator)
- Removing <fieldset> since options are bordered by the tab box now
- Correcting the conditional which controls the table markup
  to prevent extra/missing </tr>
- Adding missing ID attribute in the OPAC template

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>