]> git.koha-community.org Git - koha.git/log
koha.git
11 years agoMerge branch 'bug_9922' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 02:25:28 +0000 (22:25 -0400)]
Merge branch 'bug_9922' into 3.12-master

11 years agoBug 9922 - holds queue shows home library with AutomaticReturn
Kyle M Hall [Mon, 25 Mar 2013 13:34:33 +0000 (09:34 -0400)]
Bug 9922 - holds queue shows home library with AutomaticReturn

Test Plan:
 1) Enable AutomaticItemReturn
 2) Place a reserve on a record where the holding and home branches differ
    for the available items
 3) Rebuild the holds queue
 4) Check the holds queue, verify the item is listed in the items to pull for the item's home branch
 5) Disable AutomaticItemReturn
 6) Rebuild the holds queue
 7) Verify the item is listed in the items to pull for the item's holding branch
 8) Enable AutomaticItemReturn
 9) Apply patch
10) Rebuild the holds queue
11) Verify the item is listed in the items to pull for the item's holding branch

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Tested per plan, and the patch seems sane. Functionality of the hold queue is restored to previous behaviour.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended test plan to make clear it has to be a record level
hold for the test plan to work.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9935' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:58:55 +0000 (21:58 -0400)]
Merge branch 'bug_9935' into 3.12-master

11 years agoBug 9935 - Social icons missing in CSSR theme
Fridolyn SOMERS [Wed, 27 Mar 2013 10:05:06 +0000 (11:05 +0100)]
Bug 9935 - Social icons missing in CSSR theme

When using CSSR theme, opac.css is missing css rules for social networks Facebook, LinkedIn ...

This patch copies css rules related to social netxork from prog theme to cssr theme.
Also copies social-sprite.png image.

Test plan :
- Set CSSR theme : syspref opacthemes=ccsr and opaccolorstylesheet=colors.css
- Set syspref SocialNetworks=Enable
- Go to a detail page at OPAC
=> check that social links are icons : Facebook, LinkedIn, Delicious, Send by email, Google Plus and Tweeter

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Social icons now showing, thanks!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7938' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:53:45 +0000 (21:53 -0400)]
Merge branch 'bug_7938' into 3.12-master

11 years agoBug 7938: Added description of -v/--verbose parameter
Will Stokes [Mon, 25 Mar 2013 04:07:02 +0000 (17:07 +1300)]
Bug 7938: Added description of -v/--verbose parameter

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
"perldoc misc/translator/translate" looks good and now mentions
the -v option.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9660' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:49:23 +0000 (21:49 -0400)]
Merge branch 'bug_9660' into 3.12-master

11 years agoBug 9660 follow-up: OpenLibrary covers are too small in CCSR too
Jared Camins-Esakov [Sat, 30 Mar 2013 01:48:15 +0000 (21:48 -0400)]
Bug 9660 follow-up: OpenLibrary covers are too small in CCSR too

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9660 - OpenLibrary covers are too small on OPAC search results
Mason James [Tue, 19 Feb 2013 03:24:15 +0000 (16:24 +1300)]
Bug 9660 - OpenLibrary covers are too small on OPAC search results

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works as advertised. OpenLibrary book cover API offers 3 cover sizes: small,
medium, and large. Switch from small to medium, for result page, with
downsizing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Improves display of OpenLibrary covers in OPAC result list.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9797' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:44:08 +0000 (21:44 -0400)]
Merge branch 'bug_9797' into 3.12-master

11 years agoBug 9797 - Follow up : use double quotes in javascript translatable strings
Fridolyn SOMERS [Fri, 22 Mar 2013 10:13:26 +0000 (11:13 +0100)]
Bug 9797 - Follow up : use double quotes in javascript translatable strings

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9797 - Untranslatable strings have returned to ajax.js
Owen Leonard [Tue, 12 Mar 2013 00:44:00 +0000 (20:44 -0400)]
Bug 9797 - Untranslatable strings have returned to ajax.js

The patch for Bug 8942 undid the changes to ajax.js made by Bug 9331.
This patch puts those changes back.

To test that preference-related error messages continue to work,
open the system preferences editor in two tabs. Log out in one tab and
try to save a system preference in the other. You should see correct
error messages.

Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9926' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:39:29 +0000 (21:39 -0400)]
Merge branch 'bug_9926' into 3.12-master

11 years agoBug 9926 - Missing perl modules in Koha
Mason James [Tue, 26 Mar 2013 06:48:03 +0000 (19:48 +1300)]
Bug 9926 - Missing perl modules in Koha

To test:

1) check perl syntax on file
     $ perl -cw ./misc/migration_tools/koha-svc.pl

     you should *not* get 'syntax OK' returned from command

2) apply patch, and install File::Slurp module
      $ sudo cpanm File::Slurp

3) check perl syntax on file
      $ perl -cw ./misc/migration_tools/koha-svc.pl

      you should now get 'syntax OK' returned from command

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Without File:Slurp 1) complains of missing module,
with module then sintax Ok.
No errors.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed module from required to optional. The two files in which
it is used are extraneous from the viewpoint of the average user.

11 years agoMerge branch 'bug_9908' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:29:21 +0000 (21:29 -0400)]
Merge branch 'bug_9908' into 3.12-master

11 years agoBug 9908 - Fixing OCLC Connexion Client
Thatcher Rea [Fri, 22 Mar 2013 21:51:15 +0000 (10:51 +1300)]
Bug 9908 - Fixing OCLC Connexion Client

Fix issue where exporting a bib from the OCLC Connexion client
or web interface to a Koha database would always result in
an "Unsuccessful request" error.

To Test:

[1] Apply patch
[2] Start the Connexion import daemon.
[3] Start the Connexion client or web interface (requires that you
    you posses OCLC cataloging credentials).
[4] Locate a bib and use Connexion to export it to the Koha database.
[5] Verify that the bib is successfully added.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Logical change and trusting sign off here as I don't have
access to WorldCat for testing this.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9923' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:28:10 +0000 (21:28 -0400)]
Merge branch 'bug_9923' into 3.12-master

11 years agoBug 9923: (MT #11060) actual cost not getting populated
Christophe Croullebois [Mon, 18 Mar 2013 17:46:03 +0000 (18:46 +0100)]
Bug 9923: (MT #11060) actual cost not getting populated

The patch 7129 introduces a bug if the unitprice is 0.0000.
Instead of showing in this case the 'ecost' if there is not 'unitprice',
it shows 0.00 and the 'Actual cost' must be manually entered. The line:
if ( @$results[0]->{'unitprice'} == 0 ) {
    @$results[0]->{'unitprice'} = '';

was wrote in this perspective.
But sprintf ( "%.2f", with '' or 0 or any string will return 0.00
and then, in the .tt 'unitprice' exists so we have the bad result.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9930' into 3.12-master
Jared Camins-Esakov [Sat, 30 Mar 2013 01:09:49 +0000 (21:09 -0400)]
Merge branch 'bug_9930' into 3.12-master

11 years agoMerge branch 'bug_9783' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:58:19 +0000 (22:58 -0400)]
Merge branch 'bug_9783' into 3.12-master

11 years agoBug 9783 - can hit submit twice when adding patrons
David Cook [Mon, 11 Mar 2013 04:08:39 +0000 (15:08 +1100)]
Bug 9783 - can hit submit twice when adding patrons

Currently, clicking twice or more on the Save button will generate
duplicate patrons when adding patrons in the Patron module. Of course,
there is handling that detects this, so you can choose to either edit
the original record (i.e. throw away the duplicate) or create a
duplicate record.

However, it shouldn't get to that point by clicking on the Save button.
That handling seems to be there to handle cases where you go through the
whole process of trying to add a new patron only to find out that they
already exist in the system (or at least their username/password do).

--

This patch uses the "preventDoubleFormSubmit" function (which is also
used in holds and fines to prevent double form submits). It was also
necessary to edit members.js, since "check_form_borrowers" was forcing
form submits despite the "preventDoubleFormSubmit" function. I've
changed it from forcing a document.form.submit to return true, which the
browser will still submit the form if it's a unique borrower, but the
"preventDoubleFormSubmit" function will still prevent multiple submits.

I've also added a "waiting" class to staff-global.js which changes the
cursor to "wait" (i.e. loading circle graphic). I've included an
"AddClass" call in "preventDoubleFormSubmit", so that the cursor graphic
will change to show users that the page is loading so that they don't
click Save again. Of course, even if they do click save again, there
will only be one submit. However, this way - as Chris Cormack mentioned
- the user knows that "something" is happening and that the form isn't
broken.

-------
Test Plan

Before applying patch...

1) Fill out the form for a new patron in the Patron module
2) Click "Save" several times
3) Once the page loads, you'll be shown a prompt that says that this
   borrower already exists. You will have the option to view the
   original record, edit the original record, or create a new patron
   anyway
4) Click on edit the existing record, and delete the patron

Apply the patch

5) Repeat steps 1 and 2
6) Notice that your cursor has changed into a little "loading" circle
   graphic when you hover over the "body" of the page, as well as any
   links or any inputs/buttons of the type "submit" within that form
7) Notice that no matter how many times you press the button, the form
   is not re-submitted. Eventually you will be taken to the new patron's
   record (no mention of duplication will occur)

Ta da! Multiple form submits are prevented and the loading graphic
signals to users that the form was submitted and that Koha is processing
their data

--

I understand that some people might want to change which elements are
given the "waiting" class. I'm happy to renegotiate this as necessary.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Looks good and works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9881' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:45:16 +0000 (22:45 -0400)]
Merge branch 'bug_9881' into 3.12-master

11 years agoBug 9881 - Remove unused tablesorter plugin from offline circulation page
Owen Leonard [Thu, 21 Mar 2013 00:49:00 +0000 (20:49 -0400)]
Bug 9881 - Remove unused tablesorter plugin from offline circulation page

The offline circulation list template doesn't need to include the
tablesorter plugin, it's unused. This patch removes it.

To test, submit some circulation transactions through the Firefox
offline circulation addon. Load the offline circ page
(offline_circ/list.pl). Confirm that there are no JavaScript errors, and
that "check/uncheck all" links work correctly.

Signoff comment: Test plan works as expected. Firebug and Chrome's builtin developer tool don't raise any errors.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, followed test plan, no negative
consequences found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9863' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:40:32 +0000 (22:40 -0400)]
Merge branch 'bug_9863' into 3.12-master

11 years agoBug 9863: Correct casing and add arrow-heads for consistency with earlier submit...
Peter Crellan Kelly [Sun, 24 Mar 2013 09:20:14 +0000 (22:20 +1300)]
Bug 9863: Correct casing and add arrow-heads for consistency with earlier submit messages.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change to make interface a little bit more consistent.
Reran web installer to test correct behaviour.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd two new developers to the history
Jared Camins-Esakov [Thu, 28 Mar 2013 02:14:22 +0000 (22:14 -0400)]
Add two new developers to the history

Welcome, Peter and Kristina, you are numbers 203 and 204.

11 years agoMerge branch 'bug_9595' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:05:14 +0000 (22:05 -0400)]
Merge branch 'bug_9595' into 3.12-master

11 years agoBug 9595: Change GPL license to 3.0
Kristina D.C. Hoeppner [Mon, 25 Mar 2013 03:48:20 +0000 (16:48 +1300)]
Bug 9595: Change GPL license to 3.0

Change the general Koha license from 2
to 3 in the About page and also link to
the new YUI BSD license page

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All links seem to be correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9918' into 3.12-master
Jared Camins-Esakov [Thu, 28 Mar 2013 02:01:56 +0000 (22:01 -0400)]
Merge branch 'bug_9918' into 3.12-master

11 years agoBug 9918 - build script updates, default to building 3.12
Robin Sheat [Mon, 25 Mar 2013 03:10:33 +0000 (16:10 +1300)]
Bug 9918 - build script updates, default to building 3.12

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9918 - Changelog updates for 3.12
Robin Sheat [Wed, 28 Nov 2012 07:02:14 +0000 (20:02 +1300)]
Bug 9918 - Changelog updates for 3.12

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9930 - can't update patron info in ccsr
Kyle M Hall [Tue, 26 Mar 2013 12:26:54 +0000 (08:26 -0400)]
Bug 9930 - can't update patron info in ccsr

Test Plan:
1) Enable ccsr theme
2) Log into update, update personal details
3) Go to mainpage.pl in intranet
4) Note there is no alert for patron modifications
5) Apply patch
6) Repeat step 2-3
6) Note there is now an alert for patron modifications

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Passes tests, tested per test plan, no side effects noted.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Requires PatronSelfRegistration and PatronSelfRegistrationDefaultCategory
to make the form show up.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9919' into 3.12-master
Jared Camins-Esakov [Mon, 25 Mar 2013 12:43:29 +0000 (08:43 -0400)]
Merge branch 'bug_9919' into 3.12-master

11 years agoBug 9919: Correct syntax error caused by missing comma.
Peter Crellan Kelly [Mon, 25 Mar 2013 03:58:28 +0000 (16:58 +1300)]
Bug 9919: Correct syntax error caused by missing comma.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple fix for a bad problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9914' into 3.12-master v3.12.00-beta1
Jared Camins-Esakov [Sat, 23 Mar 2013 14:48:48 +0000 (10:48 -0400)]
Merge branch 'bug_9914' into 3.12-master

11 years agoBug 9914: dependency updates for 3.12
Jared Camins-Esakov [Sat, 23 Mar 2013 14:45:28 +0000 (10:45 -0400)]
Bug 9914: dependency updates for 3.12

Update the lists of packages required for various versions of Debian and
Ubuntu.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBump version for Koha 3.12.00-beta1 release
Jared Camins-Esakov [Sat, 23 Mar 2013 13:54:28 +0000 (09:54 -0400)]
Bump version for Koha 3.12.00-beta1 release

11 years agoCorrect 3.11 updates to use CheckVersion rather than TransformToNum
Jared Camins-Esakov [Sat, 23 Mar 2013 13:52:58 +0000 (09:52 -0400)]
Correct 3.11 updates to use CheckVersion rather than TransformToNum

11 years agoUpdate release notes for 3.12.00-beta1
Jared Camins-Esakov [Sat, 23 Mar 2013 13:35:08 +0000 (09:35 -0400)]
Update release notes for 3.12.00-beta1

11 years agoMerge branch 'bug_9912' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 13:13:32 +0000 (09:13 -0400)]
Merge branch 'bug_9912' into 3.12-master

11 years agoBug 9912: DateUtils.t must not access database
Jared Camins-Esakov [Sat, 23 Mar 2013 13:08:05 +0000 (09:08 -0400)]
Bug 9912: DateUtils.t must not access database

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoAdd Rolando Isidoro to history
Jared Camins-Esakov [Sat, 23 Mar 2013 12:29:20 +0000 (08:29 -0400)]
Add Rolando Isidoro to history

Congratulations, Rolando! You are the 202nd developer with a patch in Koha.

11 years agoMerge branch 'bug_9911' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 12:27:15 +0000 (08:27 -0400)]
Merge branch 'bug_9911' into 3.12-master

11 years agoBug 9911: update Acquisitions unit test to look for correct fields
Jared Camins-Esakov [Sat, 23 Mar 2013 12:24:13 +0000 (08:24 -0400)]
Bug 9911: update Acquisitions unit test to look for correct fields

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoRevert "Merge branch 'bug_7688' into 3.12-master"
Jared Camins-Esakov [Sat, 23 Mar 2013 04:36:37 +0000 (00:36 -0400)]
Revert "Merge branch 'bug_7688' into 3.12-master"

This reverts commit 60508cb03d825f515461c1898361ac0eb3cffb2b, reversing
changes made to 8579d07f1474a2393e518b66e9aa6c3464ab2e81.

The patches for bug 7688 caused a failure in t/db_dependent/Serials.t:
not ok 8 - test getting history from sub-scription

Conflicts:

installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl

11 years agoMerge branch 'bug_9506' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 04:29:15 +0000 (00:29 -0400)]
Merge branch 'bug_9506' into 3.12-master

11 years agoBug 9506: FIX gst list values for each basket
Jonathan Druart [Thu, 21 Mar 2013 13:13:22 +0000 (14:13 +0100)]
Bug 9506: FIX gst list values for each basket

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Problems raised by QA for the basket list page in the 3 pages
layout (pdfformat::layout3pages) fixed.

GST column on the summary page now gives a list of all used
GST rates for each individual basket.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9506: FIX GST values for the basketgroup print action
Jonathan Druart [Wed, 30 Jan 2013 10:33:37 +0000 (11:33 +0100)]
Bug 9506: FIX GST values for the basketgroup print action

Due to the multi VAT development (Bug 5335), values are not well calculated in
the pdf generated by the basketgroup print action.

Test plan:
- Add one or more basket to a basketgroup.
- Close and print this basketgroup
- Check that different values correspond to values in the basket detail page.

Don't forget to test with different parameters (multiple vat, vendor
include/don't include tax).

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_6209' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 04:13:15 +0000 (00:13 -0400)]
Merge branch 'bug_6209' into 3.12-master

11 years agoBug 6209 follow-up, make strings translatable
Paul Poulain [Fri, 22 Mar 2013 11:14:37 +0000 (12:14 +0100)]
Bug 6209 follow-up, make strings translatable

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 6209 [Revised] Standardize on one plugin for client-side form validation
Owen Leonard [Tue, 20 Mar 2012 14:20:25 +0000 (15:20 +0100)]
Bug 6209 [Revised] Standardize on one plugin for client-side form validation

This patch adds the jQuery "Validation" plugin
(http://docs.jquery.com/Plugins/Validation) and includes it by
default in the staff client along with an include file containing
translatable strings for all of the plugin's possible messages.

The staff client's main JavaScript file has been modified to perform
automatic validation of any form with the class "validated."

For a simple example I have modified the library entry form
to mark required fields as required (something which had not
been done before). Each required field has been given a class,
"required" and the HTML5 attribute "required." The former adds
the hook for the plugin, the latter adds browser-based validation
in recent browsers (and which will be superceded by the plugin
if JavaScript is enabled).

This will check for inputs classed "required" without any
additional configuration. More complex forms (with specific
data types, for instance) will require more inline JavaScript
configuration.

$("#FormID").validate({ /* configuration details */ });

Also added to the library entry form are checks on the email and URL
fields via classes ("email" and "url", respectively). This demonstrates
validation of content without forcing the field to be required.

To test, go to Administration -> Libraries and Groups and choose
"New library." Submit the form without entering a library code
or name. You should be prevented from submitting the form and be
shown an error message by each field. Perform the same check with an
existing entry.

To test browser-based validation, disable JavaScript and follow
the same procedure.

Revision rebases the patch against current master and adds missing
"//<![CDATA["

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described with new or existing library.
No errors.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_5343' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:57:05 +0000 (23:57 -0400)]
Merge branch 'bug_5343' into 3.12-master

11 years agoBug 5343: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 03:56:51 +0000 (23:56 -0400)]
Bug 5343: Increment version number

Database update for bug 5343 has been given version 3.11.00.116

11 years agoBug 5343: Fix non english string
Jonathan Druart [Fri, 22 Mar 2013 10:40:02 +0000 (11:40 +0100)]
Bug 5343: Fix non english string

Replace "Not orderable" with "Cannot be ordered"
and 3 others typos

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Testing notes:
- Ordered same subscription multiple times
- Tried different settings of AcqCreateItem for a full
  workflow from order to receive
- Undid a receipt and checked correct behaviour
- Ordered a book in between, to see item creation and
  receiving still works.

Note for documentation:
Acquisition details on the subscription only show the
last invoice and the last order. You can of course find
all orders/invoices using the acquisition search.

Overall very nice much needed functionality!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Fix non english string
Jonathan Druart [Fri, 22 Mar 2013 10:40:02 +0000 (11:40 +0100)]
Bug 5343: Fix non english string

Replace "Not orderable" with "Cannot be ordered"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup: remove useless string on the serials result page
Jonathan Druart [Fri, 22 Mar 2013 09:46:49 +0000 (10:46 +0100)]
Bug 5343: Followup: remove useless string on the serials result page

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: It is not possible to add a subscription for another supplier
Jonathan Druart [Thu, 21 Mar 2013 14:16:09 +0000 (15:16 +0100)]
Bug 5343: It is not possible to add a subscription for another supplier

If a supplier is defined for a subscription, you cannot order this
subscription to another supplier. If no supplier is defined, you can.

FIX: If a cancelled order is linked to a subscription, you can order it.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup: invoicenumber no longer exists, use invoiceid.
Jonathan Druart [Wed, 20 Mar 2013 12:44:25 +0000 (13:44 +0100)]
Bug 5343: Followup: invoicenumber no longer exists, use invoiceid.

A previous patch replaces invoicenumber with invoiceid.

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Followup FIX quantity received if items are created when receiving
Jonathan Druart [Wed, 20 Mar 2013 09:55:49 +0000 (10:55 +0100)]
Bug 5343: Followup FIX quantity received if items are created when receiving

For subscriptions, if items are created when receiving, the quantity
received is always 1, not 0.

+ UI: Show the subscription search form (instead of hidden)

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 5343: Link serial and acqui modules
Jonathan Druart [Tue, 23 Oct 2012 10:13:16 +0000 (12:13 +0200)]
Bug 5343: Link serial and acqui modules

DB changements:
- Adds 2 fields: subscription.reneweddate and aqorders.subscriptionid.
- Removes 2 unused fields: aqorders.serialid and aqorders.subscription.

Main test plan:
1) Create a subscription
2) Create a bookseller and a basket
3) Add a new order 'from a subscription'
4) Search your subscription and check if results are correct
5) Click on the "order" link
6) Check the biblio information are filled in the form
7) Select a budget and fill some price information.
8) retry steps 3 and 4. Verify you cannot order the same subscription.
Message:Outstanding order (only one order per subscription is allowed).
9) click on your subscription (already added) and check you have a new
table "Acquisition details" with your price information in the "Ordered
amount" line.
10) receive this order
11) On your subscription detail page, the "Spent amount" line must be
filled with your price information.
12) Re order the same subscription. Now you are allowed to. Prices
information have to be filled with the previous information.
13) Retry some orders and click on a maximum of links in order to find a
bug :)

Signed-off-by: Leila Arkab <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7740' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:22:42 +0000 (23:22 -0400)]
Merge branch 'bug_7740' into 3.12-master

11 years agoMerge branch 'bug_9900' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 03:21:57 +0000 (23:21 -0400)]
Merge branch 'bug_9900' into 3.12-master

11 years agoBug 9900 - Plugins should not be enabled by default
Kyle M Hall [Fri, 22 Mar 2013 13:58:53 +0000 (06:58 -0700)]
Bug 9900 - Plugins should not be enabled by default

Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple changes, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 02:57:53 +0000 (22:57 -0400)]
Bug 7740: Increment version number

Database update for bug 7740 has been given version 3.11.00.115

11 years agoBug 7740 - Followup - Add Non-XSLT Caveaut to system preference
Kyle M Hall [Fri, 22 Mar 2013 10:42:56 +0000 (03:42 -0700)]
Bug 7740 - Followup - Add Non-XSLT Caveaut to system preference

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 follow-up : removing duplicate declaration
Paul Poulain [Fri, 22 Mar 2013 09:41:11 +0000 (10:41 +0100)]
Bug 7740 follow-up : removing duplicate declaration

the my $branches = GetBranches();
already exist at line 444 (introduced by this patch)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 follow-up: css additions for ccsr theme
Paul Poulain [Fri, 22 Mar 2013 09:36:27 +0000 (10:36 +0100)]
Bug 7740 follow-up: css additions for ccsr theme

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7740 - Highlight items in own library in search results/detail page in OPAC
Kyle M Hall [Thu, 18 Oct 2012 16:40:02 +0000 (12:40 -0400)]
Bug 7740 - Highlight items in own library in search results/detail page in OPAC

This feature enables a particular library's items to be emphasized and moved
to the first position on the search results and details pages of the OPAC.

It is enabled by the sytem preference HighlightOwnItemsOnOPAC.

To choose which branches items are emphasized, use the system preference
HighlightOwnItemsOnOPACWhich. It has two modes.

If set to PatronBranch, the items emphasized will be those of the same
library as the patron's library. If no one is logged into the opac, no
items will be highlighted.

If set to OpacURLBranch, the library is chosen based on the Apache
environment variable BRANCHCODE.

For example, this could be added to the OPAC section of koha-httpd.conf:
SetEnv BRANCHCODE "CPL"

The point of this feature is to allow each library on a given Koha server
to have a specific subdomain for the opac where that library's items are
empasized. That was http://branch1.opac.mylibrary.org will emphasize the
items of branch1, while http://branch2.opac.mylibrary.org will emphasize
the items of branch2.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Nora Blake <nblake@masslibsystem.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7688' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:23:16 +0000 (22:23 -0400)]
Merge branch 'bug_7688' into 3.12-master

11 years agoBug 7688: Increment version number
Jared Camins-Esakov [Sat, 23 Mar 2013 02:23:00 +0000 (22:23 -0400)]
Bug 7688: Increment version number

Database update for bug 7688 has been given version 3.11.00.114

11 years agoBug 7688: Set firstacquidate in updatedatabase if it's not set
Julian Maurice [Fri, 22 Mar 2013 09:53:51 +0000 (09:53 +0000)]
Bug 7688: Set firstacquidate in updatedatabase if it's not set

firstacquidate is now a mandatory field, so it must be set.
The updatedatabase process set firstacquidate value to one of:
- the planned date of the first serial for this subscription, or if not
  found,
- the subscription start date.

+ auto-select the numbering pattern when modifying a subscription.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Followup FIX perldoc
Jonathan Druart [Tue, 19 Feb 2013 10:02:43 +0000 (11:02 +0100)]
Bug 7688: Followup FIX perldoc

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Fix generating next serial when there is no 'Expected' issue
Julian Maurice [Tue, 11 Dec 2012 10:16:54 +0000 (11:16 +0100)]
Bug 7688: Fix generating next serial when there is no 'Expected' issue

It can happen when the Expected issue is claimed. In this case the
status of the last serial is 'Claimed'

This patch change the API of GetNextSeq and GetSeq

Test plan:
- Create a subscription which starts a long time ago so that serials
  automatically appear in late issues
- Receive the first serial
- Go to claims page and claim the 2nd serial.
- Go back to the subscription page and click on 'Serial collection'
- You should have 2 serials, one 'Arrived' and one 'Claimed'.
- Click on Generate Next. This should fail with a software error message
  ("can't call method output ...")
- Apply this patch and click again on Generate Next. A new issue must be
  created with status 'Expected'.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Translate sample frequencies for french
Julian Maurice [Mon, 17 Sep 2012 10:36:01 +0000 (12:36 +0200)]
Bug 7688: Translate sample frequencies for french

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688 follow-up: Small fixes for QA #2
Julian Maurice [Mon, 17 Sep 2012 10:04:53 +0000 (12:04 +0200)]
Bug 7688 follow-up: Small fixes for QA #2

- "return undef" -> "return"
- ":utf8" -> ":encoding(UTF-8)"
- TAB -> SPACES

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688 follow-up: Small fixes for QA
Julian Maurice [Thu, 2 Aug 2012 14:55:24 +0000 (16:55 +0200)]
Bug 7688 follow-up: Small fixes for QA

- # Subroutines::ProhibitExplicitReturnUndef: Got 1 violation(s) in
  C4::Serials::GetSubscriptionIrregularities
- Bad template constructions fixed in serials/subscription-add.tt

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7688: Change subscription numbering pattern and frequencies
Julian Maurice [Thu, 8 Mar 2012 16:12:55 +0000 (17:12 +0100)]
Bug 7688: Change subscription numbering pattern and frequencies

Serials numbering pattern and frequencies are no more hard-coded. Now
it's possible to create, edit and delete numbering patterns (and
frequencies). This implies new sql tables (subscription_numberpatterns
and subscription_frequencies)

Numbering patterns behave almost as before, there are still the same
values to configure (addX, everyX, settoX, whenmorethanX). lastvalueX
and innerloopX remain in subscription tables.

There is a new value in numbering patterns: numberingX. For each
"column" (X, Y or Z) you can tell how to format the number. Actually
numberingX can be set to:
 - 'dayname' (name of the day) (0-6 or 1-7 depending on which day is the
   first of the week)
 - 'monthname' (name of the month) (0-11)
 - 'season' (name of the season) (0-3) (0 is Spring)

These names are localized by using POSIX::setlocale and POSIX::strftime
and setting a 'locale' value to the subscription. Locale have to be
installed on the system.
Note that season names are not localized using POSIX::strftime (it can't
do this), so names are hardcoded into the code (available languages: en,
fr). This could be fixed in the future by using a Perl localization
framework.

Frequencies can be configured using 3 parameters:
 - 'unit': one of 'day', 'week', 'month', 'year'
 - 'issuesperunit': integer >= 1, the number of received issues per
   'unit'
 - 'unitsperissue': integer >= 1, the number of 'unit' between two
   issues
One of 'issuesperunit' and 'unitsperissue' must be equal to 1.
Examples:
  unit = 'day', issuesperunit=3, unitsperissue=1 => 3 issues per day
  unit = 'week', issuesperunit=1, unitsperissue=3 => 1 issue each 3
  weeks

Prediction pattern is now computed server-side and is more consistent
with what Koha will do. The publication date is displayed alongside the
serial number.
Irregularities can now be checked one by one, in the prediction pattern
table, or if frequency is 'day-based' (unit is 'day'), there is the
possibility to check all issues for a week day at once.

When an irregularity is found, there is the possibility to keep the
serial number unchanged, or to skip it. It is configured at subscription
creation or modification.
For instance, with a daily subscription you can have:
  skip serial number  |  keep serial number
----------------------+----------------------
 2012-01-01  ¦  No 1  | 2012-01-01  ¦  No 1
 2012-01-03  ¦  No 3  | 2012-01-03  ¦  No 2

To lighten the subscription modification page, manual history has been
moved in its own page subscription-history.pl which is accessible on
subscription-detail.pl, tab 'Planning'.

Important note: updatedatabase.pl script takes into account existing
subscriptions and create appropriate numbering patterns for them (it
tries to create as few patterns as possible). Frequency is
mapped to the correct entry in subscription_frequencies table.

This patch includes kohastructure.sql and updatedatabase.pl changes
+ sample frequencies data and sample numberpatterns data for fresh
installs (sample data is included in updatedatabase.pl)

=== TEST PLAN: ===

Create a new subscription:

  - Go to Serials module and click "New subscription" button
  - On the first page, choose a biblio and click next to go to the
    second page
  - Pick a first issue publication date
  - Choose frequency '1/day'
  - Choose a subscription length of 15 issues
  - Choose a subscription start date
  - Choose numbering pattern 'Volume, Number'
  - A table appears, fill 'Begins with' cells with '1'
  - Click on 'Test prediction pattern' button

The prediction pattern is displayed at the right of the page. You can
see in it the serial number, the publication date and a checkbox to
allow you to choose which serials will not be received (irregularities).

You can see that serial number start from "Vol 1, No 1" continue to "Vol
1, No 12" and then restart with "Vol 2, No 1".

Frequency is '1/day' so you can see that publication date is incremented
by one day line after line.

  - Now you can play a little with frequencies and numbering patterns,
    change one of them (or both) and click again on 'Test prediction
    pattern'
  - For example, choose frequency '3/weeks' and click on 'Test
    prediction pattern' button'.

There is a little behaviour change compared with current master.
Publication date will not be guessed within the week. Koha can't know
when you will receive issues. So the publication date stay the same
(monday of each week) for 3 consecutive issues and then jump to the next
week.

  - Now choose frequency '1/3 months' and numbering pattern 'Seasonal'
  - Fill 'Begins with' cells with '2012' for Year and '0' for Season
  - Click on 'Test prediction pattern'
  - You should have something like 'Spring 2012', 'Summer 2012', ...,
    'Winter 2012', 'Spring 2013'
  - Note that you can have seasons for south hemisphere by entering '2'
    in 'Year/Inner counter'
  - 2nd note: if you have some locales installed on your system, you can
    type its name in the 'Locale' field (actually it does not work for
    seasons name, only for month names and day names)

If you want to modify the numbering pattern you can still do it here:

 - Click on 'Show/Hide advanced pattern' link. The advanced pattern
   table is shown but all fields are readonly
 - Click on 'Modify pattern' button. All readonly fields are now
   editable. Note that 'Begins with' and 'Inner counter' line are
   repeated here and any modifications in the small table will be
   replicated in the big table, and vice versa.
 - Pattern name is emptied, if you type a new name, a new pattern will
   be created, and if you type the same name as an existing numbering
   pattern, this one will be modified (with a confirmation message)
 - There is two new lines in this table:
   - Label: it's what is displayed in the smaller table headers above
   - Numbering: used to format numbers in different ways. can be
     'seasons', 'monthname' or 'dayname'. Month name and day name can be
     localized using the 'Locale' field. Seasons can't (values for
     english and french are hard-coded in Serials.pm)
 - You can modify what you want in the table and click on 'Test
   prediction pattern' button each time you want to see your
   modifications. (Note that checkboxes for irregularities aren't displayed
   in this mode, and you can't save the subscription until you have saved
   or cancelled your changes).
 - To cancel your modifications, just click on 'Cancel modifications'
   button.
 - To save them, click on 'Save as new pattern'. If the pattern name is
   already existing, a confirmation box will ask you if you want to
   modify the existing numbering pattern. Otherwise a new pattern will be
   created and automatically selected.

Once you have finished modifying numbering pattern. You can click again
on 'Test prediction pattern' to define irregularities, and then click on
'Save subscription'.

Now you can check the serials module still works correctly:

 - Check the subscription detail page to confirm that nothing is
   missing. Especially the 'Frequency' and 'Number pattern' infos
 - Try to receive some issues. Check that the serial number is correctly
   generated and if irregularities you have defined are taken into
   account (if you have defined some).
 - Check that receiving is blocked once you have reached the number of
   issues you have defined in subscription length (or once you have
   reached the subscription end date)

In serials menu (to the left of almost each page of serials menu) you
have two new links: 'Manage frequencies' and 'Manage numbering
patterns'.

'Manage numbering patterns' lead to a page which list all numbering
patterns and allow you to create, edit or delete them. The interface is
almost the same as numbering pattern modification in subscription-add.pl

'Manage frequencies' lead to a page which list all frequencies and allow
you to create, edit or delete them.

Try to create a new frequency:
 - Click on 'Manage frequencies' link in the serials menu and then click
   on 'New frequency':
 - Fill in the description (mandatory).
 - Unit is one of 'day', 'week', 'month', year' or 'None' ('None' is for
   an irregular subscription)
 - If unit is different from 'None' you have to fill the two following
   fields (Issues per unit, and Units per issue)
 - Note that at least one of those must be equal to 1
 - Issues per unit is the number of received issues by 'unit' and Units
   per issue is the number of 'unit' between two issues
 - Display order is used to build the drop-down list. Leave empty and it
   will be set to 0 (top of the list)
 - Then click on 'Save'
 - Check that this new frequency appears in the frequencies table and in
   the drop-down list in subscription-add.pl

Subscription history has been moved in its own page. To test if it still
works, choose a subscription with manual history enabled (or modify an
existing subscription to turn on manual history).

 - On the detail page, tab 'Planning', you should have a link 'Edit history'.
 - Click on it
 - Modify history and click on Save
 - In tab 'Summary' you should have the infos you just entered

And finally, you can check that old subscriptions (by old I mean
subscriptions that existed before the update) are correctly linked to an
existing numbering pattern and an existing frequency. Numbering patterns
should be named 'Backup pattern X' where X is a number.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Great development! Work as described. No koha-qa errors
(with all patches applied). Please QA this fast.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9068' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:08:15 +0000 (22:08 -0400)]
Merge branch 'bug_9068' into 3.12-master

11 years agoBug 9068: Baebeltheque - add podcast
Jonathan Druart [Wed, 30 Jan 2013 09:33:25 +0000 (10:33 +0100)]
Bug 9068: Baebeltheque - add podcast

Test plan:
check that there is no regression on the opac detail page.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Small patch. No errors

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9604' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:05:42 +0000 (22:05 -0400)]
Merge branch 'bug_9604' into 3.12-master

11 years agoBug 9604 - Follow-up: Changing labels from branch to library
Katrin Fischer [Fri, 22 Mar 2013 15:35:29 +0000 (16:35 +0100)]
Bug 9604 - Follow-up: Changing labels from branch to library

Relabelling the new filters for consistency.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9604: filter overdues with homebranch and holdingbranch
Fridolyn SOMERS [Wed, 13 Feb 2013 08:41:29 +0000 (09:41 +0100)]
Bug 9604: filter overdues with homebranch and holdingbranch

This patch adds in overdues.pl filters on item home branch and holding branch.

Test plan :
Play with item home branch and holding branch filters and check
it filters well results.

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are added to the list of overdues in the circulation module.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_7973' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 02:01:49 +0000 (22:01 -0400)]
Merge branch 'bug_7973' into 3.12-master

11 years agoBug 7973 : Follow up to remove an extraneous my
Chris Cormack [Thu, 21 Mar 2013 21:51:31 +0000 (10:51 +1300)]
Bug 7973 : Follow up to remove an extraneous my

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes problem found by QA scripts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 7973- Allow for new type of LDAP authentication
Rolando Isidoro [Fri, 19 Oct 2012 14:57:36 +0000 (15:57 +0100)]
Bug 7973- Allow for new type of LDAP authentication

This patch aims to solve the LDAP bind authentication method. Here are
some considerations:

- This is a standalone patch, so all the previous submitted ones are
  rendered obsolete;
- LDAP bind authentication is now done in 3 steps:
  1 - LDAP anonymous bind;
  2 - LDAP search entry for the given username;
  3 - LDAP bind with the DN of the found entry + the given password.
- The process fails if none or more than 1 entries are found for the
  given username;
- The <principal_name> setting in koha-conf.xml isn't used anymore;
- The patch is backwards compatible, so users already using the
  previously implemented LDAP bind authentication should be able to use
  it the same.

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

Signed-off-by: Vitor Fernandes
Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script and has 2 solid sign offs.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9909' into 3.12-master
Jared Camins-Esakov [Sat, 23 Mar 2013 01:53:29 +0000 (21:53 -0400)]
Merge branch 'bug_9909' into 3.12-master

11 years agoBug 9909: Don't install KitchenSink plugin if plugin dir isn't writable
Jared Camins-Esakov [Sat, 23 Mar 2013 01:49:27 +0000 (21:49 -0400)]
Bug 9909: Don't install KitchenSink plugin if plugin dir isn't writable

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9907' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 21:50:17 +0000 (17:50 -0400)]
Merge branch 'bug_9907' into 3.12-master

11 years agoBug 9907 - Plugins test dies early on some servers
Kyle M Hall [Fri, 22 Mar 2013 21:31:15 +0000 (14:31 -0700)]
Bug 9907 - Plugins test dies early on some servers

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9890' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 20:54:11 +0000 (16:54 -0400)]
Merge branch 'bug_9890' into 3.12-master

11 years agoBug 9890 - Fix the new plugin system for package installs
Kyle M Hall [Fri, 22 Mar 2013 13:30:42 +0000 (06:30 -0700)]
Bug 9890 - Fix the new plugin system for package installs

Create the plugins directory in the Makefile

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
One line change, all ok.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9883' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 13:52:37 +0000 (09:52 -0400)]
Merge branch 'bug_9883' into 3.12-master

11 years agoBug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load...
Kyle M Hall [Fri, 22 Mar 2013 11:40:36 +0000 (04:40 -0700)]
Bug 9883 - Koha::Plugins::* should not require koha-conf to load - Followup - Load C4::Auth at run time

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Unset KOHA_CONF variable and made sure t/00_load.t passed
Also ran Makefile.PL doing an update on my existing installation
and checked koha-conf.xml:

 <pluginsdir>/home/katrin/koha-dev/var/lib/plugins</pluginsdir>
 <enable_plugins>0</enable_plugins>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail
Kyle M Hall [Fri, 22 Mar 2013 09:08:02 +0000 (02:08 -0700)]
Bug 9883 - Add missing parameter to koha-conf.xml causing Plugins.t to fail

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoBug 9883 - Koha::Plugins::Base should not require koha-conf to load
Kyle M Hall [Thu, 21 Mar 2013 08:35:16 +0000 (01:35 -0700)]
Bug 9883 - Koha::Plugins::Base should not require koha-conf to load

Test Plan:
1) Run t/db_dependent/Plugins.t
2) Apply patch
3) Re-run t/db_dependent/Plugins.t

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
The tests pass both before and after the patch. I can see no
ill effects on the functionality (tried uploading and
accessing the Kitchen Sink plugin).

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
After installing libmodule-bundled-files-perl from the
debian.koha-community.org I ran through Makefile.PL
updating my conf file successfully. Also all tests
and QA script pass now.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_9257' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:21 +0000 (08:25 -0400)]
Merge branch 'bug_9257' into 3.12-master

11 years agoBug 9257: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 12:25:15 +0000 (08:25 -0400)]
Bug 9257: Increment version number

Database update for bug 9257 has been given version 3.11.00.113

11 years agoBug 9257 - Add "groups" to normal search pulldown
Kyle M Hall [Mon, 10 Dec 2012 18:58:16 +0000 (13:58 -0500)]
Bug 9257 - Add "groups" to normal search pulldown

This patch adds the ability to add groups to the library select
pulldown on the opac, if it is enabled.

Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) Go to Administration › Libraries and groups
4) Create a new group, or edit an existing one
5) Ensure the 'Show in search pulldown' checkbox is checked
6) Save the group
7) Enable OpacAddMastheadLibraryPulldown if it is not already enabled
8) Load the OPAC, try the group search from the libraries pulldown menu

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Yes! Now this works, and well.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
11 years agoMerge branch 'bug_8365' into 3.12-master
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:22 +0000 (07:58 -0400)]
Merge branch 'bug_8365' into 3.12-master

11 years agoBug 8365: Increment version number
Jared Camins-Esakov [Fri, 22 Mar 2013 11:58:14 +0000 (07:58 -0400)]
Bug 8365: Increment version number

Database update for bug 8365 has been given version 3.11.00.112