koha:mainline.git
9 years agoAdding a feature to export star_ratings data stars
Chris Cormack [Sun, 19 May 2013 08:06:37 +0000 (20:06 +1200)]
Adding a feature to export star_ratings data

9 years agoUpdate release notes for Koha 3.12.0 RC3
Jared Camins-Esakov [Sat, 18 May 2013 16:10:11 +0000 (12:10 -0400)]
Update release notes for Koha 3.12.0 RC3
(cherry picked from commit e8030f7f31db1ff9084ea827d3e155358e2054b1)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoTranslation update for 3.12.0
D Ruth Bavousett [Sat, 18 May 2013 15:55:29 +0000 (12:55 -0300)]
Translation update for 3.12.0
(cherry picked from commit a7dd6850903301e5282c13e44a836408943d19d3)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10270' into 3.14-master
Jared Camins-Esakov [Sat, 18 May 2013 10:14:00 +0000 (06:14 -0400)]
Merge branch 'bug_10270' into 3.14-master

9 years agoBug 10270: Fix shebang
Jonathan Druart [Fri, 17 May 2013 14:54:43 +0000 (16:54 +0200)]
Bug 10270: Fix shebang

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10270: GetOrdersByBiblionumber needs better unit tests
Jonathan Druart [Fri, 17 May 2013 09:38:34 +0000 (11:38 +0200)]
Bug 10270: GetOrdersByBiblionumber needs better unit tests

prove t/db_dependent/Acquisition/GetOrdersByBiblionumber.t

Signed-off-by:Mathieu Saby <mathieu.saby@univ-rennes2.fr>
I made 2 tests :
$prove -v t/db_dependent/Acquisition/GetOrdersByBiblionumber.t
and
$prove -v t/db_dependent/Acquisition.t
The 2 tests are successful.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10259' into 3.14-master
Jared Camins-Esakov [Sat, 18 May 2013 10:08:00 +0000 (06:08 -0400)]
Merge branch 'bug_10259' into 3.14-master

9 years agoBug 10259 - koha-*-zebra scripts are expected to run without warnings if no instance...
Tomas Cohen Arazi [Thu, 16 May 2013 14:11:52 +0000 (11:11 -0300)]
Bug 10259 - koha-*-zebra scripts are expected to run without warnings if no instance name passed

Commented out the code that checks for intance name parameters on the zebra service handling scripts.
It restores the original behaviour, while leaving error checking code.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9824' into 3.14-master
Jared Camins-Esakov [Fri, 17 May 2013 11:59:14 +0000 (07:59 -0400)]
Merge branch 'bug_9824' into 3.14-master

9 years agoBug 9824 - Hide basket with no expected items in basqket list by bookseller
Lyon3 Team [Thu, 21 Mar 2013 13:47:43 +0000 (14:47 +0100)]
Bug 9824 - Hide basket with no expected items in basqket list by bookseller

Before patch you will see in acqui/booksellers.pl all the baskets ever
created.
After the patch you will see in acqui/booksellers.pl only the basket
with expected items.

Test plan :
* Create a basket with some orders lines
You should see this basket in acqui/booksellers.pl
* receive or cancel all the line in this basket
This basket shouldn't appear any more in acqui/booksellers.pl

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10266' into 3.14-master
Jared Camins-Esakov [Fri, 17 May 2013 11:54:19 +0000 (07:54 -0400)]
Merge branch 'bug_10266' into 3.14-master

9 years agoAdd Rafal Kopaczka to the history
Jared Camins-Esakov [Fri, 17 May 2013 11:53:53 +0000 (07:53 -0400)]
Add Rafal Kopaczka to the history

Welcome, Rafal! You are the 211th developer with a patch in Koha.

9 years agoBug 10266 - Statuses not appearing in the OPAC
Rafal Kopaczka [Wed, 15 May 2013 14:19:05 +0000 (16:19 +0200)]
Bug 10266 - Statuses not appearing in the OPAC

Simply revert order of 2 lines in Items.pm. Previous line write to
variable used in next line as function argument.

To Test:

Give an item a special restricted value, define one if you have to
in the authorised values.

Observe that, without this patch, statuses are not shown in the
OPAC in parentheses. My example was an item that had a restricted
value of "Library Staff Only"

It should have been shown under status on the detail page of the
OPAC, but was not.

Apply the patch, observe that restricted values are now shown
for your item, for example:
Available (Library Staff Only) in the status column.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and test plan.
Simple change fixing a display problem, no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoUpdate 3.12 release notes for Koha 3.12.0-rc2
Jared Camins-Esakov [Thu, 16 May 2013 02:13:08 +0000 (22:13 -0400)]
Update 3.12 release notes for Koha 3.12.0-rc2
(cherry picked from commit bbc4267296a2d00522648eafd232ecc69a31712e)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoLanguage update for 3.12-RC
D Ruth Bavousett [Thu, 16 May 2013 01:45:14 +0000 (22:45 -0300)]
Language update for 3.12-RC
(cherry picked from commit 8e1e34f2fa0c6e85388a1888cda77a0879cb07f5)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10030' into 3.14-master
Jared Camins-Esakov [Thu, 16 May 2013 01:51:55 +0000 (21:51 -0400)]
Merge branch 'bug_10030' into 3.14-master

9 years agoBug 10030: QA Followup for trivial false warning detected while testing
Marcel de Rooy [Wed, 15 May 2013 14:06:49 +0000 (16:06 +0200)]
Bug 10030: QA Followup for trivial false warning detected while testing

Moving the warn line below the line that returns if amount<=0.
If amount<=0, a false warn is now raised because of the return after it.
We should only warn here if we do not return.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with fines.pl on overdue.
Before this patch:
Reducing fine for item 199709 borrower 23 from 44 to -1 - MaxFine reached.
This did not happen however because of the return.
After this change: no false warning.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10030 - MaxFines checks against amount, not amount outstanding
Kyle M Hall [Thu, 11 Apr 2013 19:46:50 +0000 (15:46 -0400)]
Bug 10030 - MaxFines checks against amount, not amount outstanding

If a patron has over time accumulated fines greater than the amount
defined in MaxFine, the patron will never get more fines even if they
have previously paid off those fines.

This bug was introduced by the patch for Bug 7420.

Test Plan:
1) Create a patron
2) Create a fine of 10.00 for that patron
3) Pay off the fine
4) Set MaxFines to 5.00
5) Check out an item to the patron, backdate the due date
   so the item should generate fines.
6) Run fines.pl, observe that no fine was created
7) Apply the patch
8) Rerun fines.pl
9) Observe that the fine was created correctly

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'deb_scripts_312_rc1' into 3.14-master
Jared Camins-Esakov [Wed, 15 May 2013 13:32:55 +0000 (09:32 -0400)]
Merge branch 'deb_scripts_312_rc1' into 3.14-master

9 years agoBug 10094 - koha-list should have a --disabled option switch
Tomas Cohen Arazi [Tue, 23 Apr 2013 13:14:37 +0000 (10:14 -0300)]
Bug 10094 - koha-list should have a --disabled option switch

This patch adds that (--disabled) option switch, Also revisits some of the code and docs.

To test:
- Apply the patch and create new packages (you might just drop the koha-list command somewhere)
- Create several instances (koha-create)
- Randomly set some as disabled, others enabled and enable email on some.
- Test all possible option switches combinations

Expected results:
- koha-list should abort with a proper message if mutually exclusive options selected (--email vs. --noemail, --enabled vs. --disabled)
- koha-list should show the exact instances you asked for

Regards
To+

P.S.: I wanted to add the --disabled option switch for the tab-completion work I'm doing, but as of bug 4876 I thought it would be ok to revisit the script to make it robust and clear.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Does what it says, and cleans up the script at the same time.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10146 - koha-stop-zebra error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 14:08:35 +0000 (11:08 -0300)]
Bug 10146 - koha-stop-zebra error handling

koha-stop-zebra now
- Checks the instance exists.
- Checks the instance is enabled.
- Checks if the zebra daemon is already running.

Regards
To+

Edit: Corrected the die message

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10157 - koha-email-enable error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 13:05:44 +0000 (10:05 -0300)]
Bug 10157 - koha-email-enable error handling

koha-email-enable now
- Checks the instance exists.
- Checks if email is already enabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10159 - koha-rebuild-zebra error handling
Tomas Cohen Arazi [Tue, 30 Apr 2013 14:58:25 +0000 (11:58 -0300)]
Bug 10159 - koha-rebuild-zebra error handling

This patch makes koha-rebuild-zebra:
- Check for the existence of the instance
- Handle arbitrary amount of instance parameters
- Capture -a and -b (which made the script rebuild twice the chosen DB). It adds the extended version (--authorities and --biblios respectively) of the option switch. This makes the -a and -b switches work as "only do authorities" (or viceversa). They can be used concurrently, which is the default behaviour when no switch is provided.
- Handle -v (and --verbose) as koha-rebuild-zebra options, to ease the use for non-techie users.
- The rebuild_zebra.pl is wrapped inside an IF to return error values if we ever make rebuild_zebra.pl return error codes (this is pointed in the code).
- Added -h/--help switches and an 'usage' output :-D Please provide patches for any wording issues, or contact me to fix it.

To test:
- Apply the patch and create your packages (or just use the script from your branch)
- Run it in this scenarios / options
  - -h/--help to see the available option switches
  - Mix them with one or more instances, of which some could be fake
  - try -a/--authorities and -b/--biblios in all possible combinations
  - try -v/--verbose works

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_6329' into 3.14-master
Jared Camins-Esakov [Wed, 15 May 2013 11:25:38 +0000 (07:25 -0400)]
Merge branch 'bug_6329' into 3.14-master

9 years agoBug 6329 - patron categories should show which fields are required
Owen Leonard [Tue, 14 May 2013 19:09:14 +0000 (15:09 -0400)]
Bug 6329 - patron categories should show which fields are required

When entering a new patron category, required fields are not indicated
on the entry form. This patch adds the "required" class to the relevant
labels.

To test, add or edit a patron category. Confirm that the required fields
(category code, category type, description, and enrollment period) are
indicated as being required with a red label.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely.
Template changes only, but no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10214' into 3.14-master
Jared Camins-Esakov [Wed, 15 May 2013 11:22:35 +0000 (07:22 -0400)]
Merge branch 'bug_10214' into 3.14-master

9 years agoBug 10214 Add header to syspref po files
Frédéric Demians [Tue, 14 May 2013 11:01:56 +0000 (13:01 +0200)]
Bug 10214 Add header to syspref po files

With this patch, header is created when creating a new syspref .po file
for a new language (translate create), and is added if it doesn't
already exist when updating an existing language (translate update).

To test:

(1) Create a new language syspref file:

    ./translate create -p xx-XX

    Check that there is an header

(2) Update an existing syspref file without header:

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header

(3) Update an existing syspref file with header:

    Modify fr-FR-pref.po. Add an email, or whatever.

    ./translate update fr-FR

    Check that fr-FR-pref.po has a header with the manual modification

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Also tested that updated pref files can still be installed correctly.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10108' into 3.14-master
Jared Camins-Esakov [Wed, 15 May 2013 11:16:29 +0000 (07:16 -0400)]
Merge branch 'bug_10108' into 3.14-master

9 years agoBug 10108 - can't print more than one page of overdues
Owen Leonard [Fri, 10 May 2013 18:44:10 +0000 (14:44 -0400)]
Bug 10108 - can't print more than one page of overdues

Printing a report like overdues in Firefox results in a printout which
cuts off in the middle. I traced the cause to something in the YUI grid
system, although I'm not sure what specific definition is the cause.

This patch adds a "screen" parameter to the @import which loads the YUI
grid CSS file. This will disable YUI grid layouts in print views. The
main disadvantage to this, as far as I can tell, is that it will
"linearize" some layouts. For instance: the patron detail page
(moremember.pl) which on screen is divided into two columns. I think
this disadvantage is outweighed by the ability to make complete prints.

To test, apply the patch and clear your cache. Try printing various
reports from Firefox. Printouts should look correct and be complete.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
CSS only change, no strings involved.
Tested with a saved SQL report 'select * from borrowers'.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_7593' into 3.14-master
Jared Camins-Esakov [Tue, 14 May 2013 17:46:12 +0000 (13:46 -0400)]
Merge branch 'bug_7593' into 3.14-master

9 years agoBug 7593: Fix unit tests
Jonathan Druart [Mon, 13 May 2013 12:00:44 +0000 (14:00 +0200)]
Bug 7593: Fix unit tests

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9575' into 3.14-master
Jared Camins-Esakov [Tue, 14 May 2013 12:29:35 +0000 (08:29 -0400)]
Merge branch 'bug_9575' into 3.14-master

9 years agoBug 9575 - Serious Holds Problem with IndependantBranches
Kyle M Hall [Tue, 12 Mar 2013 18:30:48 +0000 (14:30 -0400)]
Bug 9575 - Serious Holds Problem with IndependantBranches

If IndependantBranches is enabled, all holds for an item display the
currently logged in library no matter what, and modifying the holds will
set all pickup locations for all the holds to that logged in library!

Test plan:
 1) Disable IndependantBranches
 2) Place 3 holds on a record with 3 different pickup locations
 3) Enable IndependantBranches
 4) Refresh the holds page for that record, all the holds show now
    show a pickup location of the logged in branch
 5) Modify the order of the holds
 6) Disable IndependantBranches
 7) Refresh the holds, verify the holds all now have a pickup
    location of the logged in branch
 8) Apply the patch
 9) Repeat steps 1-3
10) Refresh the holds page for that record, all the holds should
    now show the correct pickup branch, but it cannot be changed
    as IndependantBranches is enabled.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
In my tests the above test plan only worked out if my user
had no superlibrarian permission. But then behaviour for
independentbranches off/on was all correct.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10233' into 3.14-master
Jared Camins-Esakov [Tue, 14 May 2013 12:17:42 +0000 (08:17 -0400)]
Merge branch 'bug_10233' into 3.14-master

9 years agoBug 10233 - Toolbar background missing from staff client catalogue page
Owen Leonard [Mon, 13 May 2013 13:57:52 +0000 (09:57 -0400)]
Bug 10233 - Toolbar background missing from staff client catalogue page

The toolbar on the cataloging home page lacks the standard toolbar id,
resulting in an inconsistent appearance. This patch adds the correct id.

To test, apply the patch, clear your browser cache, and view the
cataloging home page (cataloguing/addbooks.pl). The toolbar should look
like other toolbars in Koha (for instance, members/members-home.pl).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, no string changed involved.
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10196' into 3.14-master
Jared Camins-Esakov [Mon, 13 May 2013 14:02:34 +0000 (10:02 -0400)]
Merge branch 'bug_10196' into 3.14-master

9 years agoBug 10196 - items table partially hidden in marc view in ccsr
Owen Leonard [Fri, 10 May 2013 20:00:51 +0000 (16:00 -0400)]
Bug 10196 - items table partially hidden in marc view in ccsr

In the CCSR theme's OPAC MARC view the table of items is truncated
because the container div is styled with "overflow:hidden." I think the
complete display of information is more important than not seeing a
horizontal scrollbar, so this patch removes the style.

To test, apply the patch and clear your browser cache. View a MARC
detail page for a title which has holdings and confirm that the entire
table can be seen. Test other pages to make sure no unwanted layout
changes have resulted.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Simple CSS change, no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8840' into 3.14-master
Jared Camins-Esakov [Mon, 13 May 2013 01:15:23 +0000 (21:15 -0400)]
Merge branch 'bug_8840' into 3.14-master

9 years agoBug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"
Mark Tompsett [Mon, 17 Dec 2012 20:51:33 +0000 (15:51 -0500)]
Bug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"

Reordered logic to accumulate MISSING_PATCHES variable and tweak
condition to be certain it was not failing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality
Tomas Cohen Arazi [Fri, 28 Sep 2012 17:11:55 +0000 (01:11 +0800)]
Bug 8840 - [SIGNED-OFF] ubuntu-pkg-check.sh fix and extend functionality

First, reworked it into a newer script with parameters:
   ubuntu-packages.sh -r
This will generate output identical to the old script, except
that it is fixed for non-english setups.
   ubuntu-packages.sh -h
This adds a brief help, which all scripts should have.
   ubuntu-packages.sh -ic
This helps handle a multi-arch problem by printing out a
relevant command for installing missing dependencies.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10079' into 3.14-master
Jared Camins-Esakov [Mon, 13 May 2013 01:06:19 +0000 (21:06 -0400)]
Merge branch 'bug_10079' into 3.14-master

9 years agoBug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBra...
Kyle M Hall [Fri, 19 Apr 2013 14:21:43 +0000 (10:21 -0400)]
Bug 10079 - HomeOrHoldingBranch should not control who can delete when IndependantBranches is enabled

Test Plan:
1) Enable IndependantBranches
2) Set HomeOrHoldingBranch to holding branch
3) Delete an item whose holding branch is your logged in branch, and
   whose home branch is not
4) Apply this patch
5) Repeat step 3, it should fail
6) Try to delete another items whose home branch is your logged in
   branch, and whose holding branch is a different branch. This
   deletetion should succeed.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Change is logical, only homebranch should determine if the item
can be deleted.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10100' into 3.14-master
Jared Camins-Esakov [Mon, 13 May 2013 00:55:11 +0000 (20:55 -0400)]
Merge branch 'bug_10100' into 3.14-master

9 years agoBug 10100: adds a class to OPAC news dates
Adrien Saurat [Tue, 23 Apr 2013 07:40:33 +0000 (09:40 +0200)]
Bug 10100: adds a class to OPAC news dates

Adds a "newsfooter" class to allow CSS modification
of the date appearing as a footer on each news.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a class, checked po files to make sure change is string safe.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_7593' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 14:30:57 +0000 (10:30 -0400)]
Merge branch 'bug_7593' into 3.14-master

9 years agoBug 7593 : QA followup : restores deleted line in C4::Acquisition
Mathieu Saby [Tue, 30 Apr 2013 06:16:18 +0000 (08:16 +0200)]
Bug 7593 : QA followup : restores deleted line in C4::Acquisition

This patch restores the line exporting GetOrderNumber that I accidentally suppressed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Restores a line that was deleted by the first patch.
Was not sure if patches should be squashed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 7593: Move orders on the destination record when merging 2 records
Mathieu Saby [Wed, 13 Mar 2013 15:12:03 +0000 (16:12 +0100)]
Bug 7593: Move orders on the destination record when merging 2 records

Revised patch according to QA comments. No more dependent from bz 9780.

At present, merging records breaks the link order/record, except
if an item of the deleted record is used in the order.
This is a serious issue for libraries creating items on receipt.
This patch moves existing orders from deleted record to destination record.
It creates a new function Acquisitions::GetOrdersByBiblionumber,
that could be used by other patches later.

To test :
Check the problem :
1. Set syspref AcqCreateItem = Create an item when receiving an order
1. Create a basket with one order
2. Put the record used by this order in a list
3. Put an other record in the list
4. Merge the 2 records, keeping as a reference the record NOT used in the order
5. In the order, you will see for that order "Deleted bibliographic information..."
6. Apply the patch
7. Repeat steps 1-4
8. In the order, you will see the title/author of the kept record.
9. Set syspref AcqCreateItem = Create an item when placing an order
10. Repeat steps 1-4 (an item will be created)
11. In the oreder, you will see the title/author of the kept record
    (it is already the case at present. the patch should not alter this behavior)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan, test suite and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9680' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 14:14:48 +0000 (10:14 -0400)]
Merge branch 'bug_9680' into 3.14-master

9 years agoBug 9680 - cart aligned right in CCSR
Owen Leonard [Fri, 10 May 2013 16:12:11 +0000 (12:12 -0400)]
Bug 9680 - cart aligned right in CCSR

The CCSR theme sets a min-width of 1000px for windows which are more
than 700px wide. This caused the cart popup window to be given a
min-width of 1000px, resulting in a broken layout with unnecessary
horizontal scrolling.

This patch adds a class to the cart template and to other pop-up window
templates to ensure that a large min-width is not enforced and to give
consistent padding to those pages.

To test, set your theme to 'CCSR' and view the following pop-up pages:

- The Cart. From the cart, trigger:
  - The "send" window
  - The "download" window
- From a view of a List's contents trigger:
 - The "send" window"
 - The "download" window

Each of these pages should look correct with no horizontal scrolling.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template and CSS changes only, but no string changes.
Save for inclusion in 3.12.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10054' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 14:11:47 +0000 (10:11 -0400)]
Merge branch 'bug_10054' into 3.14-master

9 years agoBug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged...
Kyle M Hall [Mon, 15 Apr 2013 13:09:05 +0000 (09:09 -0400)]
Bug 10054 - When SingleBranchMode is enabled, allow superlibrarians to set logged in library

Currently, when SingleBranchMode is enabled, nobody can change the
logged in library in Koha. To change it requires disable
SingleBranchMode, switching the library, and re-enabling it. It seems
reasonable to allow superlibrarians to switch the logged in library even
if SingleBranchMode is enabled.

Test Plan:
1) Apply this patch
3) Enable SingleBranchMode
4) Log in as a superlibrarian
5) Attempt to change the logged in branch
   This change should succeed
6) Log in as a non-superlibrarian account
7) Attempt to change the logged n branch
   This should not be allowed, as per Koha's current behavior

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I guess this doesn't do any harm even though the practical motivations
behind it, as described in the bug, seem otherwise solvable. If
SingleBranchMode is supposed to prevent librarians from switching their
logged in library why can they choose their library when they first log
in? Was SingleBranchMode supposed to only affect the OPAC originally? Or
should the login form be modified? This seems to be a band-aid on a
poorly-implemented feature.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works as decribed. As this only adds a check for a superlibrarian
it seems safe and should not interfere with normal staff accounts.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10225' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 14:09:38 +0000 (10:09 -0400)]
Merge branch 'bug_10225' into 3.14-master

9 years agoBug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu
Owen Leonard [Thu, 9 May 2013 19:08:41 +0000 (15:08 -0400)]
Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu

The user should not be shown edit/delete links when clicking on a row in
additems which they cannot edit because of the IndependantBranches
setting. This patch adds a class to the row to exclude such rows in the
JavaScript onclick handler.

To test:

- Turn IndependantBranches on and edit items for a title which
  has holdings from various branches including your own.
- Click a row for an item which is held by your library. You should see
  the "Edit/Delete" links appear.
- Click a row for an item which is held by another library. No links
  should appear.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Changes to the templates include no string changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10134' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 14:05:40 +0000 (10:05 -0400)]
Merge branch 'bug_10134' into 3.14-master

9 years agoBug 10134 - set XSLT usage ON as default, for new Koha installs
Magnus Enger [Wed, 8 May 2013 09:10:27 +0000 (11:10 +0200)]
Bug 10134 - set XSLT usage ON as default, for new Koha installs

Currently, new installs are created with XSLT display set to "off",
but XSLT seems to be the preferred way to display records, so
having the default be "on" instead seems to make sense. This patch
will of course only affect new installs.

To test:
- Apply the patch
- Run through the webinstaller on an empty database
- Log in to the staff client and search for "xslt" in system
  preferences
- Verify that XSLTDetailsDisplay, XSLTResultsDisplay,
  OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay are all set to
  "default"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passes test plan correctly.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes syspref.sql for new installations to use XSLT views
by default. No changes to existing installations, no
string changes.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9679' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 13:58:04 +0000 (09:58 -0400)]
Merge branch 'bug_9679' into 3.14-master

9 years agoBug 9679 - can't place hold from cart in CCSR
Owen Leonard [Fri, 10 May 2013 13:50:51 +0000 (09:50 -0400)]
Bug 9679 - can't place hold from cart in CCSR

When the CCSR theme is enabled, selecting items in the cart and clicking
"place hold" triggers a JavaScript error and fails. This patch adds a
function missing from the CCSR version of basket.js.

To test, apply the patch and clear your browser cache.

- Enable the CCSR theme and put items into the OPAC cart.
- Open the cart, select one or more items, and click "place hold."

The cart should automatically close and the main window should redirect
to the holds screen showing your selections.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed patch fixes the problem described.
All tests and QA script pass, JavaScript only change.
No strings involved, save for inclusion in 3.12.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10201' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 13:54:11 +0000 (09:54 -0400)]
Merge branch 'bug_10201' into 3.14-master

9 years agoBug 10201 [Follow-up] Old OPAC patron update system should be removed
Owen Leonard [Tue, 7 May 2013 16:11:23 +0000 (12:11 -0400)]
Bug 10201 [Follow-up] Old OPAC patron update system should be removed

The previous patch missed removal of one template, kohaerror.tt, which
was used only by opac-userupdate.pl. This patch removes it.

To test, apply the patch and search Koha source files for references to
kohaerror. There should be none.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass. Updating the German po files
with this patch applied no new strings appeared.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10201 - Old OPAC patron update system should be removed
Owen Leonard [Mon, 6 May 2013 14:56:03 +0000 (10:56 -0400)]
Bug 10201 - Old OPAC patron update system should be removed

The old pages for viewing and updating patron details in the OPAC have
been superceded by the new script opac-memberentry.pl. This patch
removes he old scripts and templates and corrects links to them.

This patch also removes reference to opac-userupdate.tt from
opac-patron-image.pl  and replaces the authentication process with one
which uses check_cookie_auth, based on the example of opac-tags.pl.

To test, edit a patron record and set the "Gone no address" flag. Log in
to the OPAC with that account and view the patron details page. The
warning about out of date contact information should link to the new
update page.

Next, attempt to place a hold. You should see the same warning, and it
should also link to the new update page.

Test the display of patron images: Log in as a user who has an image
associated with their account and navigate to
/cgi-bin/koha/opac-patron-image.pl. Their patron image should display.

A search of Koha source files should return no results for the missing
scripts or templates.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10217' into 3.14-master
Jared Camins-Esakov [Sun, 12 May 2013 13:46:06 +0000 (09:46 -0400)]
Merge branch 'bug_10217' into 3.14-master

9 years agoBug 10217 - Make sure direct links to detail views work when there is no session
Magnus Enger [Wed, 8 May 2013 10:03:48 +0000 (12:03 +0200)]
Bug 10217 - Make sure direct links to detail views work when there is no session

To reproduce:
- Make sure you do not have a session for the OPAC you will be testing
  with. Delete the CGISESSID session cookie if you have one.
- Go directly to a detail view, e.g.:
  /cgi-bin/koha/opac-detail.pl?biblionumber=1
- Observe the error "Can't use an undefined value as a HASH
  reference at /home/magnus/scripts/kohadev/opac/opac-detail.pl line 445."

To test:
- Apply the patch
- Reload the page with the error
- You should now see the detail view of the record, as usual

Thanks to Chris Cormack who suggested the fix for this!

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan, confirmed patch fixes the problem.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9681' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 14:03:51 +0000 (10:03 -0400)]
Merge branch 'bug_9681' into 3.14-master

9 years agoBug 9681: Increment version number
Jared Camins-Esakov [Wed, 8 May 2013 14:03:26 +0000 (10:03 -0400)]
Bug 9681: Increment version number

Database update for bug 9681 has been given version 3.11.00.301

9 years agoBug 9681: Add some indexes in database
Paul Poulain [Mon, 6 May 2013 13:06:47 +0000 (15:06 +0200)]
Bug 9681: Add some indexes in database

Some table columns should have an index to speed SQL queries :
- statistics table has only one index (used to make heavy queries for reports)
- itemtype should have an index in items and biblioitems (this is used in circulation to check the number of existing issues of a specific item type)
- issue.branchcode and issue.issuingbranch

Test plan :
- Create a new database using kohastructure.pl
=> check there is no SQL error and that new indexes are present (mysql> show create table)
Apply update database on a master version
=> check there is no SQL error and that new indexes are present (mysql> show create table)

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Indexes created as described. No errors.
Fixing small merge conflict.
Test presence of new indexes on all affected tables.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10185' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 14:00:53 +0000 (10:00 -0400)]
Merge branch 'bug_10185' into 3.14-master

9 years agoBug 10185: Add missing columns in update 3.09.00.025
Julian Maurice [Mon, 6 May 2013 06:43:50 +0000 (06:43 +0000)]
Bug 10185: Add missing columns in update 3.09.00.025

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
SQL only changes fixing an important database update.

IMPORTANT: Patches must be backported to all versions containing
the database update 3.09.00.025.

I used the test plan provided by Julian with some additions:
1/ Do a fresh 3.8 install
2/ Do some reserves
3/ Check your old_reserves table is empty
4/ Update your sources to 3.10
5/ Run updatedatabase.pl
6/ Your reserves table is now empty!

I made sure I had item level and title level holds, also
suspended holds.

I repeated the test with entries in my old_reserves table
(cancelled and filled holds) to make sure this is also still
working correctly.

Before the patch we lost all suspended holds and when the
old_reserves table was empty also all holds in general.
After the patch the reserve_id is added but the other data
in both tables is not altered.

NOTE: Adding the reserve_id first to old_reserves and then
to reserves we are missing one id in between.
old_reserves: 1,2,3
reserves: 5,6
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10185: Fix update 3.09.00.025
Julian Maurice [Fri, 3 May 2013 15:20:17 +0000 (17:20 +0200)]
Bug 10185: Fix update 3.09.00.025

It can remove all reserves from reserves table when there is no entries
in old_reserves.
This is due to @ai which is set to NULL in
  SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )
and reserve_id > NULL returns no results in
  INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan and comments on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10156' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 13:52:28 +0000 (09:52 -0400)]
Merge branch 'bug_10156' into 3.14-master

9 years agoBug 10156 - Fix usr/bin/perl path for get_report_social_data.pl
David Cook [Wed, 8 May 2013 08:00:29 +0000 (18:00 +1000)]
Bug 10156 - Fix usr/bin/perl path for get_report_social_data.pl

Currently, the perl path for get_report_social_data.pl is "#!/bin/perl"
when it should be "#!/usr/bin/perl".

While I'm not entirely sure how to test this, rangi did mention:

23:47 (it wouldnt work on my debian install)
23:48  zsh: no such file or directory: /bin/perl

It's a pretty trivial change, so I'm not sure it needs much of a test
plan.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Before the patch "grep -r '#!/bin/perl' in the misc dir shows one file
with this line, and it is indeed get_report_social_data.pl. After the
patch there are no occurrences left.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8278' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 13:50:02 +0000 (09:50 -0400)]
Merge branch 'bug_8278' into 3.14-master

9 years agoBug 8278: build the structure with to_json instead of manually.
Jonathan Druart [Mon, 22 Apr 2013 14:19:01 +0000 (16:19 +0200)]
Bug 8278: build the structure with to_json instead of manually.

Test plan:
Same as previously.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Mon, 15 Apr 2013 19:09:24 +0000 (15:09 -0400)]
Bug 8278 [Follow-up] Replace YUI autocomplete in UNIMARC 210c plugin

This follow-up corrects the heading of the plugin pop-up window to match
the UNIMARC field it targets.

To test, trigger the plugin and confirm that the pop-up window refers to
210c.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Smple patch, fixes label. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl
Chris Cormack [Tue, 2 Apr 2013 06:48:34 +0000 (19:48 +1300)]
Bug 8278 : Follow up, fixing the permissions on cataloguing/ysearch.pl

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

Without patch and normal staff user, logged out
With patch, normal staff, valid output.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin
Owen Leonard [Fri, 8 Mar 2013 17:56:24 +0000 (12:56 -0500)]
Bug 8278 - Replace YUI autocomplete in UNIMARC 210c plugin

This plugin, for pseudo-authority-control of publisher information,
used YUI autocomplete to pull existing publisher data from the
biblioitems table. Despite its name it is not UNIMARC-specific.
It assumes publisher name data is saved in biblioitems.

This patch converts the autocomplete to jQueryUI. The search
script has been amended to return valid JSON. The template has
been modified to enable the jQueryUI autocomplete and to add
structure more consistent with other popups.

To test, link the publisher name field in your MARC structure to
the unimarc_field_210c_bis.pl plugin. Open a MARC record for
editing and click the "tag editor" link to launch the plugin.
Type the first few letters of a publisher which exists in your
database. You should get an autocomplete menu of publishers
which match your search. Select one and click the "choose"
button to fill the field in the MARC editor.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: work as described. No errors.

Test: link 260b to plugin. Edit record and search first letters
of present editors. Menú appears and can select and fill value.

Why plugin 210c_bis talk about field 225a?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Plugin now works correctly for me, even when linked
to 260$b in a MARC21 installation. All tests and QA script
pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10204' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 13:47:44 +0000 (09:47 -0400)]
Merge branch 'bug_10204' into 3.14-master

9 years agoBug 10204 - Patron image no longer appears in the OPAC
Owen Leonard [Mon, 6 May 2013 16:29:01 +0000 (12:29 -0400)]
Bug 10204 - Patron image no longer appears in the OPAC

With the addition of opac-memberentry.pl to the OPAC we lost a way to
display the image associated with a patron's account. This patch adds
display of the patron image to opac-memberentry.pl now that
opac-userdetails.pl and opac-userupdate.pl are deprecated.

To test:

1. Log into the OPAC as a patron who has an image associated with their
   account. View the "my personal details" tab and confirm that the
   patron image appears with and without OPACPatronDetails enabled.

2. Log into the OPAC as a patron who has no image associated with their
   account. View the "my personal details" tab and confirm that the
   layout looks correct.

3. Turn off OPACpatronimages and confirm that the "my personal details"
   page looks correct.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with OpacPatronDetails and OpacPatronImags turned on/off
and it's working well.
Template only changes.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9961' into 3.14-master
Jared Camins-Esakov [Wed, 8 May 2013 13:44:29 +0000 (09:44 -0400)]
Merge branch 'bug_9961' into 3.14-master

9 years agoBug 9961: Add truncation support to QP driver
Jared Camins-Esakov [Thu, 2 May 2013 15:53:36 +0000 (11:53 -0400)]
Bug 9961: Add truncation support to QP driver

The original implementation of QueryParser did not handle truncation
based on the QueryAutoTruncate system preference. This patch adds support.

To test:
1) Apply patch.
2) Turn on UseQueryParser.
3) Set QueryAutoTruncate to "automatically."
4) Search for "har". Note that it returns results with words
   like "Harry" (i.e. with right truncation).
5) Search for "har*". Note that it still returns results with right
   truncation.
6) Set QueryAutoTruncate to "only when * is added."
7) Search for "har". Note that it returns only records that have the
   exact word "har" in them (most likely there will be none unless you
   have Hebrew items).
8) Search for "har*". Note that once again it returns results for "Harry"
   (i.e. right truncated results).
9) Sign off.

This patch also reindents a hash in Koha/QueryParser/Driver/PQF.pm
because it was hard to read before.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Thx for fixing this Jared!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'master' of git://git.koha-community.org/koha into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:54:25 +0000 (08:54 -0400)]
Merge branch 'master' of git://git.koha-community.org/koha into 3.14-master

9 years agoMerge branch 'bug_8896' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:50:15 +0000 (08:50 -0400)]
Merge branch 'bug_8896' into 3.14-master

9 years agoBug 8896 QA Followup for regex
Marcel de Rooy [Thu, 11 Apr 2013 10:48:26 +0000 (12:48 +0200)]
Bug 8896 QA Followup for regex

Making sure that the regex does not kill more than it should.
Amended: does now only look at separating colons(;) not commas(,).
Amended: two index expressions in direct context replaced by same regex for
consistency.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8896: Delete serials no more missing from missinglist
Lyon3 Team [Mon, 8 Apr 2013 09:14:09 +0000 (11:14 +0200)]
Bug 8896: Delete serials no more missing from missinglist

When manual history is disabled in subscription history section
if a serial has been previously set as missing and is received
or set as expected, late or claimed, it will be deleted from missinglist

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Regex needs a followup. More comments on Bugzilla.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10166' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:38:33 +0000 (08:38 -0400)]
Merge branch 'bug_10166' into 3.14-master

9 years agoBug 10166: Increment holdable counter
Jared Camins-Esakov [Mon, 6 May 2013 12:35:00 +0000 (08:35 -0400)]
Bug 10166: Increment holdable counter

The $anyholdable variable was set to 0 or 1. However, as it is set in
a loop, and future changes to the opac-reserve.pl script may require
knowing how many items the patron is going to place a hold on, it makes
more sense to treat $anyholdable as a counter. This follow up turns it
into one.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 10166 - Can't place holds on multiple titles if one or more are un-holdable
Owen Leonard [Wed, 1 May 2013 18:22:50 +0000 (14:22 -0400)]
Bug 10166 - Can't place holds on multiple titles if one or more are un-holdable

opac-reserve.pl tries to check whether all selected titles in a
multiple-hold batch are unavailable to be placed on hold. However, the
logic is flawed in such a way that if the last item in the batch cannot
be placed on hold the script assumes none can be placed on hold.

This patch modifies the way the script tracks the "no titles available
for holds" variable in order to correct the error.

To test, place multiple holds by selecting titles from a list of search
results. Test three conditions:

- All titles are available to be placed on hold

  You should see no onscreen warnings, and all titles should be
  selectable on the place hold screen. A "Place hold" button should
  appear at the bottom.

- Some titles can be placed on hold, some cannot

  The titles which can be placed on hold should be selectable.
  Titles which cannot be placed on hold should show a warning
  message. A "Place hold" button should appear at the bottom.

- No titles can be placed on hold

  "Sorry, none of these items can be placed on hold." should appear at
  the top of the page. All titles should appear with warning messages.
  There should be no "Place hold" button.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10183' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:24:59 +0000 (08:24 -0400)]
Merge branch 'bug_10183' into 3.14-master

9 years agoBug 10183: Remove single pixel on the serials collection page
Jonathan Druart [Fri, 3 May 2013 12:37:46 +0000 (14:37 +0200)]
Bug 10183: Remove single pixel on the serials collection page

Test plan:
Go on the serials collection page
Check that the single pixels before and after the table have
disappeared.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Pixels are removed, table functions work as before.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10176' into 3.14-master
Jared Camins-Esakov [Mon, 6 May 2013 12:22:39 +0000 (08:22 -0400)]
Merge branch 'bug_10176' into 3.14-master

9 years agoBug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE...
Karam Qubsi [Sat, 4 May 2013 20:44:57 +0000 (23:44 +0300)]
Bug 10176: Solve the Invalid URLs in 'Refine Search Results' when it uses UNICODE symbols

I just add use utf8; to the Search.pm and the problem
was solved .

Test plan :
1- Add bib records with non-latin characters
2- search for some of these records
3- try to refine your search using Subject / Author

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work fixing URLs in facets. Now they work correctly.
No errors.

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

I tested facets with the 22 Arabic records provided on
bug 9579 successfully. Before the patch the links are not
correct, after applying the patch the links work as
expected.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoComplete revert of 6554
Galen Charlton [Fri, 3 May 2013 14:58:50 +0000 (07:58 -0700)]
Complete revert of 6554

One line wasn't caught by the initial revert.  Thanks to
Jonathan Druart for catching this.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoBug 10084 - YUI path wrong in CCSR theme with packages
Tomas Cohen Arazi [Fri, 19 Apr 2013 18:14:17 +0000 (15:14 -0300)]
Bug 10084 - YUI path wrong in CCSR theme with packages

Bug 9052 fixed this for prog, CCSR was left aline in the dark (it's friday).

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Worked fine in my test package, good work Tomas
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoBug 10150 - koha-email-disable error handling
Tomas Cohen Arazi [Mon, 29 Apr 2013 15:29:40 +0000 (12:29 -0300)]
Bug 10150 - koha-email-disable error handling

koha-email-disable now
- Checks the instance exists.
- Checks if email is already disabled.

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
9 years agoIncrement version for 3.12.0-beta3 release
Jared Camins-Esakov [Thu, 2 May 2013 03:06:54 +0000 (23:06 -0400)]
Increment version for 3.12.0-beta3 release

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoAdd release notes for 3.12.0-beta3
Jared Camins-Esakov [Thu, 2 May 2013 03:04:49 +0000 (23:04 -0400)]
Add release notes for 3.12.0-beta3

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_10044' into 3.14-master
Jared Camins-Esakov [Thu, 2 May 2013 02:58:41 +0000 (22:58 -0400)]
Merge branch 'bug_10044' into 3.14-master

9 years agoBug 10044: Remove duplicate pagination on the pending orders page.
Jonathan Druart [Fri, 26 Apr 2013 11:59:18 +0000 (13:59 +0200)]
Bug 10044: Remove duplicate pagination on the pending orders page.

Test plan:
Check that there is just one pagination on the pending orders page.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works and deletes the old pagination that was replaced by
datatables.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'deb_scripts_312beta3' into 3.14-master
Jared Camins-Esakov [Thu, 2 May 2013 02:28:32 +0000 (22:28 -0400)]
Merge branch 'deb_scripts_312beta3' into 3.14-master

9 years agoBug 9250 - Followup to add koha-*-sip commands to koha-common.xml
Magnus Enger [Tue, 5 Mar 2013 12:49:11 +0000 (13:49 +0100)]
Bug 9250 - Followup to add koha-*-sip commands to koha-common.xml

The original patch for Bug 9250 did not add the new commands to
debian/docs/koha-common.xml, which functions as a sort of table
of contents for the real commands. This patch adds them.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Simple documentation patch
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9250 - [SIGNED-OFF] provide commands to manage the SIP server
Robin Sheat [Mon, 10 Dec 2012 05:57:04 +0000 (18:57 +1300)]
Bug 9250 - [SIGNED-OFF] provide commands to manage the SIP server

This adds commands required to control the SIP server. These commands
are:
* koha-enable-sip - copies the SIP config to the sites directory
* koha-start-sip - starts the SIP server processes
* koha-stop-sip - stops the SIP server processes

It also calls these as appropriate from the koha-common init script.

To use:
1) sudo koha-enable-sip instancename
2) sudo vim /etc/koha/sites/instancename/SIPconfig.xml
   Do whatever is needed for your site's SIP configuration
3) sudo koha-start-sip instancename

To test:
1) Build packages with this patch
2) Ensure that sudo koha-start-sip instancename doesn't do anything
3) Run sudo koha-enable-sip instancename
4) Edit /etc/koha/sites/instancename/SIPconfig.xml if needed (probably
   not required for testing)
5) Run sudo koha-start-sip instancename
6) Note that the sip processes are now running
7) Run sudo koha-stop-sip instancename
8) Note that the sip processes have gone
9) Reboot your Koha server
10) Note that the sip processes are back

Sponsored-By: Waitaki District Council Libraries
Sponsored-By: South Taranaki District Council Libraries
Sponsored-By: Horowhenua District Council Libraries
Sponsored-By: Rangitikei District Council Libraries
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. koha-start-sip without a prior koha-enable-sip
does nothing. koha-enable-sip copies the SIP config file to the
instance directory. After koha-enable-sip, koha-start-sip and
koha-stop-sip works as expected. After a reboot, the SIP processes are
still running. I have not actually tested the SIP servers after they
have been started, but assume they work the same as always.
The man pages look good.

The new commands should also have been added to the man page for
koha-common. I'll do a followup for that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>