koha.git
9 years agoMerge branch 'bug_9552' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 05:21:41 +0000 (00:21 -0500)]
Merge branch 'bug_9552' into 3.12-master

9 years agoBug 9552 - BIB1 Relation "Greater Than" Attribute Not Mapped Properly in CCL.Properties
David Cook [Wed, 6 Feb 2013 02:49:28 +0000 (13:49 +1100)]
Bug 9552 - BIB1 Relation "Greater Than" Attribute Not Mapped Properly in CCL.Properties

Currently, you can use "lt,le,eq,ge" in your CCL query to handle
"lesser than, lesser or equal to, equal to, greater than or equal
to" relationships.

The only one missing is "gt" (Bib1 2=5).

The mappings are also off "ne, phonetic, stem", but those are Bib1
attributes that Zebra doesn't support, so that's not really relevant.

To test:

[1] Before applying the patch, try the following query in the OPAC:

pubdate,gt:2006

You should get "no results found".

[2] After applying the patch (and note that ccl.properties will usually
need to be installed in the run-time Zebra configuration directory), try
the same search.  This time, you could get back the titles whose
publication date is after 2006.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_7507' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 04:57:22 +0000 (23:57 -0500)]
Merge branch 'bug_7507' into 3.12-master

9 years agoBug 7507 - Audience Subtype limit on OPAC Advanced Search does not have all Audiences
David Cook [Mon, 28 Jan 2013 22:55:58 +0000 (09:55 +1100)]
Bug 7507 - Audience Subtype limit on OPAC Advanced Search does not have all Audiences

The OPAC audience subtype limit did not have all the audiences defined
by the MARC record (and available in the staff client advanced search).
It also incorrectly labelled some of the audiences that it did include.

This patch copies the (correct) audiences from the staff client template
to the OPAC template.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Test plan:
 * Search before applying by audience
 * Apply patch
 * Search by a newly appeared audience
 * Search by an audience that was there before

All tests pass!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Replace tab with 4 spaces.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9546' into 3.12-master
Jared Camins-Esakov [Thu, 7 Feb 2013 04:54:49 +0000 (23:54 -0500)]
Merge branch 'bug_9546' into 3.12-master

9 years agoBug 9546 : Updating make manifest tardist
Chris Cormack [Tue, 5 Feb 2013 03:59:41 +0000 (16:59 +1300)]
Bug 9546 : Updating make manifest tardist

To test
perl Makefile.PL
make manifest tardist

Before the patch you will get an error, after the patch it will create
the tarball

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
make manifest tardist and make manifest zipdist work
perfectly after patch was applied.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9421' into 3.12-master
Jared Camins-Esakov [Wed, 6 Feb 2013 17:37:20 +0000 (12:37 -0500)]
Merge branch 'bug_9421' into 3.12-master

9 years agoBug 9421: tools/picture-upload.pl not Plack-compatible
Jared Camins-Esakov [Fri, 18 Jan 2013 02:39:38 +0000 (21:39 -0500)]
Bug 9421: tools/picture-upload.pl not Plack-compatible

This patch avoids using file-level private variables in subroutines
by passing the needed variables as parameters to the subroutines.

To test (under Plack):
1) Try uploading a patron image without applying the patch. Notice
   it fails.
2) Apply patch.
3) Try uploading a patron image again, noticing this time it succeeds.

To test (under Apache):
1) Apply patch.
2) Try uploading a patron image, confirm that it works.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Fixes Plack, does not break Apache. Works as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9432' into 3.12-master
Jared Camins-Esakov [Wed, 6 Feb 2013 17:31:41 +0000 (12:31 -0500)]
Merge branch 'bug_9432' into 3.12-master

9 years agoBug 9432: Plack changes for acqui/addorderiso2409.pl
Jared Camins-Esakov [Sat, 19 Jan 2013 00:48:20 +0000 (19:48 -0500)]
Bug 9432: Plack changes for acqui/addorderiso2409.pl

Without this patch, after selecting the file I want to add acquisitions
from, Plack explodes. With this patch, it works.

To test without Plack:
1) Apply patch.
2) Try adding an order item from a staged file.
3) If it works, there are no regressions from the patch.

To test with Plack:
1) Try adding an order item from a staged file. It will fail.
2) Apply patch.
3) Try adding an order item from a staged file.
3) If it works, the patch is successful.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Fixes Plack, does not break Apache. Works as expected.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9509' into 3.12-master
Jared Camins-Esakov [Tue, 5 Feb 2013 12:36:20 +0000 (07:36 -0500)]
Merge branch 'bug_9509' into 3.12-master

9 years agoBug 9509 - batchMod.pl does not ensure each barcode is unique
Kyle M Hall [Wed, 30 Jan 2013 17:44:32 +0000 (12:44 -0500)]
Bug 9509 - batchMod.pl does not ensure each barcode is unique

Test plan:
1) Browse to Tools › Batch item deletion
2) Enter a list of barcodes, make sure you have at
   least one barcode listed more than once
3) Click continue
4) Verify the duplicated barcode shows up multiple times in the table
5) Apply patch
6) Refresh the page
7) Verify each barcode now displays only once

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
verified bug and fix - both good.

Nice test plan, thanks!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9201' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 13:15:58 +0000 (08:15 -0500)]
Merge branch 'bug_9201' into 3.12-master

9 years agoBug 9201 OAI-PMH mapping value cannot be 0
Mirko Tietgen [Thu, 13 Dec 2012 22:37:58 +0000 (23:37 +0100)]
Bug 9201 OAI-PMH mapping value cannot be 0

Allow the value of a OAI set mapping to be 0 / empty. Delete the mapping if field or subfield are empty.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Now it is possible to add a value == 0 or an empty string.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8733' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 13:04:34 +0000 (08:04 -0500)]
Merge branch 'bug_8733' into 3.12-master

9 years agoBug 8733: Increment version number
Jared Camins-Esakov [Mon, 4 Feb 2013 13:01:34 +0000 (08:01 -0500)]
Bug 8733: Increment version number

Database update for bug 8733 has been given version 3.11.00.017

9 years agoBug 8733: Follow-up The isbn sent to idream contains dash
Jonathan Druart [Fri, 1 Feb 2013 12:38:13 +0000 (13:38 +0100)]
Bug 8733: Follow-up The isbn sent to idream contains dash

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8733 follow-up: restore isbn class in details page
Jared Camins-Esakov [Thu, 31 Jan 2013 15:44:26 +0000 (10:44 -0500)]
Bug 8733 follow-up: restore isbn class in details page

For some reason the isbn CSS class was missing from the details
page, presumably due to a bad merge. This one-line commit re-adds
it so that the critics reviews will show up.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8733: Add IDreamBooks.com enhanced content
Jared Camins-Esakov [Mon, 24 Sep 2012 11:47:11 +0000 (07:47 -0400)]
Bug 8733: Add IDreamBooks.com enhanced content

Adds the following enhanced content to the OPAC, all controlled by
separate sysprefs:
1) A "Readometer" which summarizes reviews on the OPAC detail page
2) A tab with snippets of critical reviews on the OPAC detail page
3) A computed rating on the results page

To test:
Find a book that is listed on IDreamBooks.com (you may have to make
sure that you have the first edition), and one that is not. Try
each of IDreamBooksReadometer, IDreamBooksReviews, and
IDreamBooksResults sysprefs, taking note of the content appearing (or
not) as appropriate.

Updated to add missing CSS to new theme.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased to latest master 2012-12-31

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9503' into 3.12-master
Jared Camins-Esakov [Mon, 4 Feb 2013 12:46:45 +0000 (07:46 -0500)]
Merge branch 'bug_9503' into 3.12-master

9 years agoBug 9503: Followup remove unused parameters passed to parcel.pl
Jonathan Druart [Thu, 31 Jan 2013 13:05:12 +0000 (14:05 +0100)]
Bug 9503: Followup remove unused parameters passed to parcel.pl

The booksellerid and datereceive parameters are useless.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9503 Correct name of parameter passed to parcel.pl
Colin Campbell [Tue, 29 Jan 2013 11:56:15 +0000 (11:56 +0000)]
Bug 9503 Correct name of parameter passed to parcel.pl

invoiceid was being passed as invoice causing GetInvoiceDetails
to silently fail and a system error downstream when
accessing the 'orders' element of the undefined invoice

Added an error message if GetInvoiceDetails called on undef

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9330' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 17:02:13 +0000 (12:02 -0500)]
Merge branch 'bug_9330' into 3.12-master

9 years agoBug 9330: title field empty when duplicating a patron
Adrien Saurat [Mon, 31 Dec 2012 11:12:02 +0000 (12:12 +0100)]
Bug 9330: title field empty when duplicating a patron

For a duplicated patron, the "Saluation" information
is now empty by default.

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_9439' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 16:30:47 +0000 (11:30 -0500)]
Merge branch 'bug_9439' into 3.12-master

9 years agoBug 9439 - Enforce superlibrarian mutual exclusivity of other permissions
David Cook [Tue, 22 Jan 2013 00:47:43 +0000 (11:47 +1100)]
Bug 9439 - Enforce superlibrarian mutual exclusivity of other permissions

Basically, when you check the checkbox for the superlibrarian permission
in the patron record, it will disable and uncheck all the other
permission checkboxes. When you uncheck the checkbox for the
superlibrarian permission, it will renable those boxes. There is also
some JS code there to ensure that the other boxes are disabled when
returning to the change permission screen (i.e. the patch is not just a
click handler).

In the event that the checkboxes for superlibrarian and other
permissions are already checked, the user will be shown a pop-up window
explaining that the superlibrarian permission is mutually exclusive to
the others (since it already includes the others) and that the
permissions for that patron will then be reset to just include the
superlibrarian permission.

Comment: Tested on master. Works as described.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9418' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 16:26:25 +0000 (11:26 -0500)]
Merge branch 'bug_9418' into 3.12-master

9 years agoBug 9418: Some corrections and additions to about.tt
Vitor FERNANDES [Thu, 17 Jan 2013 14:38:02 +0000 (14:38 +0000)]
Bug 9418: Some corrections and additions to about.tt

Test plan:

- Apply patch
- See if KEEP SOLUTIONS and C & P Bibliography Services
- Software Coop should be now software.coop

Bug 9418: Some corrections and additions to about.tt

Replaced & with &amp; according codelines.

Sponsored-by: KEEP SOLUTIONS
Combined to patches into one.
Reorder C-entries as per sort order.

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_9526' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 16:19:45 +0000 (11:19 -0500)]
Merge branch 'bug_9526' into 3.12-master

9 years agoBug 9526 - Patron statistics table is not pretty, needs circ toolbar
Owen Leonard [Thu, 31 Jan 2013 20:56:13 +0000 (15:56 -0500)]
Bug 9526 - Patron statistics table is not pretty, needs circ toolbar

This patch adds the circ/members toolbar, corrects page title and
breadcrumbs, and adds some handling for column names which are coming
from the database. The table of statistics can display any items table
column specified in the StatisticsFields preference, but we can at least
embed the most obvious cases in the template for human readability: item
type, collection code, location, home library, and holding library.

To test, view the patron statistics page. For a patron with no
statistics you should see a message saying so. For a patron with
statistics you should see human-friendly labels for the columns
referenced above.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.
Wouldn't be better with centered cell contents?

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
FIX a typo:
- <h3>Statistcs for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
+ <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9401' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 16:06:18 +0000 (11:06 -0500)]
Merge branch 'bug_9401' into 3.12-master

9 years agobug 9401: remove direct reads of CGISESSID cookie by JavaScript
Galen Charlton [Wed, 16 Jan 2013 05:45:00 +0000 (21:45 -0800)]
bug 9401: remove direct reads of CGISESSID cookie by JavaScript

Having embedded JavaScript read the session cookie directly
is unnecessary and prevents the CGISESSID cookie being marked
httpOnly as a security measure.  The only Koha JS attempting
this was the AJAX tags code.

To test:

- In general, verify that there are no regression withs
  adding tags in the OPAC or reviewing them in the staff interface.
- In specific, for the OPAC
  - log into the OPAC
  - retrieve a bib record
  - add a tag
  - refresh the bib details page to verify that the
    tag was added
  - make sure the TagsInputOnList syspref is on
  - perform a search
  - add a tag to more than one record from the search results page
  - repeat the preceding using the CCSR theme
- And in the staff interface
  - Go to the review tags tool
  - Reject a tag
  - Refresh to verify that the tag was rejected

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
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_9102' into 3.12-master
Jared Camins-Esakov [Fri, 1 Feb 2013 15:50:27 +0000 (10:50 -0500)]
Merge branch 'bug_9102' into 3.12-master

9 years agoBug 9102 : Followup Set HttpOnly on the CGISESSID cookie
Jonathan Druart [Mon, 3 Dec 2012 10:17:27 +0000 (11:17 +0100)]
Bug 9102 : Followup Set HttpOnly on the CGISESSID cookie

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
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_9265' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:48:47 +0000 (11:48 -0500)]
Merge branch 'bug_9265' into 3.12-master

9 years agoBug 9265 - Switch to HTML5 doctype in OPAC and staff client
Owen Leonard [Wed, 12 Dec 2012 17:47:20 +0000 (12:47 -0500)]
Bug 9265 - Switch to HTML5 doctype in OPAC and staff client

This patch replaces the XHTML DOCTYPE with an HTML5 one. The HTML5
validator seems to be significantly different than the XHTML one,
so I'm seeing lots of new errors. This patch includes corrections
for one: Deprecation of the "language" attribute of <script>
tags.

To test, view pages in the OPAC and staff client. They should
appear as normal. Numerous validation follow-ups will be required,
but I suggest these be handled incrementally.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
test on some intranet pages and I found no regression. (chromium and
firefox).
The w3c page about the doctype: http://www.w3.org/TR/html5-diff/#doctype

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9308' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:44:51 +0000 (11:44 -0500)]
Merge branch 'bug_9308' into 3.12-master

9 years agoBug 9308 - logo-koha.png not transparent in ccsr theme
Ed Veal [Thu, 20 Dec 2012 15:23:06 +0000 (10:23 -0500)]
Bug 9308 - logo-koha.png not transparent in ccsr theme

This patch will allow the koha logo to be transparent so you can change
the background color.

To test this please change the background color within the css.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9483' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:43:28 +0000 (11:43 -0500)]
Merge branch 'bug_9483' into 3.12-master

9 years agoBug 9483 - Use DataTables on batch patron modifications page
Owen Leonard [Thu, 24 Jan 2013 15:56:02 +0000 (10:56 -0500)]
Bug 9483 - Use DataTables on batch patron modifications page

Replace the tablesorter plugin with the DataTables plugin on the
batch patron modifications page.

To test, submit multiple patron barcodes for batch modification
(Tools -> Batch patron modification). Confirm that table sorting
works correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9268' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:40:26 +0000 (11:40 -0500)]
Merge branch 'bug_9268' into 3.12-master

9 years agoBug 9268 - Scanning in barcode or ISBN in Acquisitions -> new order submits the form...
Liz Rea [Wed, 12 Dec 2012 01:55:14 +0000 (14:55 +1300)]
Bug 9268 - Scanning in barcode or ISBN in Acquisitions -> new order submits the form unexpectedly

To Test:

* Go to Acquisitions - Manage Orders
* Search for a vendor
* Click New Basket.
* Fill required fields
* Press Save.
* Click on "From a new (empty) record"
* Type in title Private Oz, Author Patterson, James.
* Scan (or type) ISBN - 9781864711875.
* (If not scanning, PRESS ENTER HERE)
* Nothing should happen. Form should not be submitted, no error message
  should appear.

Sponsored by: Hauraki District Libraries, New Zealand

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested according to test plan in Firefox and Chromium on Ubuntu.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9382' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)]
Merge branch 'bug_9382' into 3.12-master

9 years agoBug 9382: Increment version number
Jared Camins-Esakov [Thu, 31 Jan 2013 16:12:57 +0000 (11:12 -0500)]
Bug 9382: Increment version number

Database update for bug 9382 has been given version 3.11.00.016

9 years agoBug 9382 - updating permission labels
Liz Rea [Mon, 14 Jan 2013 02:32:42 +0000 (15:32 +1300)]
Bug 9382 - updating permission labels

first, replicate:
go to More -> permissions on any user. Notice that it says various things "privileges, flags, permissions" they are interchangeable and inconsistent.
also note that some of the permissions are nonsensical and/or not descriptive enough, or not using canonical terminology (borrowers instead of patrons, for example)

To test:
interface consistency changes

-> means "turns into"

- page title - privileges -> permissions
- breadcrumbs - privileges -> permissions
- headings - privileges -> permissions
- "set flags" button -> save

Permissions that have changed description:

- Catalogue changes to "Required for staff login" in bold (this was the original impetus for this boatload of changes)
- reports
- editauthorities
- management
- serials
- updatecharges
- circulate
- parameters
- borrowers
- tools
- staffaccess
- edit_patrons (only on updatedb, not on new db)

- Read through and make sure there are no typos, and that the descriptions seem to jive with what privileges the permission gives the user. Suggestions are, in fact, welcome.

- If you are feeling ambitious, go ahead and create a new, clean database and check the wording there as well - it should match what has been done in the db update.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested both with existing database and new database

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Tested with existing database.  Introduces no new mysql-isms.
Kudos for adding that syspref in bold, that got me when I first started with Koha
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9494' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:11:38 +0000 (11:11 -0500)]
Merge branch 'bug_9494' into 3.12-master

9 years agoBug 9494: update default LOC z39.50 target settings
Galen Charlton [Fri, 25 Jan 2013 16:49:20 +0000 (11:49 -0500)]
Bug 9494: update default LOC z39.50 target settings

This patch updates the seed data from the target list at
http://www.loc.gov/z3950/lcserver.html#addr.

Comment: new target works. updated deleting and reloading
sample targets.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I agree with Galen that this may need to be incorproated as a follow-up
for current installations. Works fine for new installs
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8108' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:09:00 +0000 (11:09 -0500)]
Merge branch 'bug_8108' into 3.12-master

9 years agoBug 8108 [Follow-up, revised] Remove unused OPAC images
Owen Leonard [Thu, 13 Dec 2012 15:05:45 +0000 (10:05 -0500)]
Bug 8108 [Follow-up, revised] Remove unused OPAC images

This patch cleans up some loose ends:

- Star ratings images are now in one sprite. Removing
  separate star ratings images.
- Amazon ratings have been removed. Related image files
  are removed by this patch.
- The tag images associated with tag links on the search
  results page were not incorporated into the main sprite.
  Now they are.

Added: The Photoshop file from which the main sprite was
generated, in case that is helpful to others. Each layer
is named, and comments have been added to the CSS
referencing the layer names. The file is GIMP-compatible.

Revisions:
- Rebased on current master
- Ported some changes to CCSR theme
- Removed unused CSS which referred to deleted images

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_8942' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 16:01:36 +0000 (11:01 -0500)]
Merge branch 'bug_8942' into 3.12-master

9 years agoBug 8942: Translation process breaks javascript (followup 2)
Fridolyn SOMERS [Wed, 28 Nov 2012 16:51:03 +0000 (17:51 +0100)]
Bug 8942: Translation process breaks javascript (followup 2)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested all changes. Functionality is unchanged. Thanks for the taking
the extra effort to move alert strings into variables.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8942: Translation process breaks javascript (followup 1)
Fridolyn SOMERS [Wed, 28 Nov 2012 15:10:09 +0000 (16:10 +0100)]
Bug 8942: Translation process breaks javascript (followup 1)

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested all effected functions. No change in functionality.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 8942: Translation process breaks javascript
Fridolyn SOMERS [Wed, 28 Nov 2012 14:37:22 +0000 (15:37 +0100)]
Bug 8942: Translation process breaks javascript

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I tested most scripts affected by this patch and visually verified
all changes. Functionality is unaffected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9174' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 15:59:15 +0000 (10:59 -0500)]
Merge branch 'bug_9174' into 3.12-master

9 years agoBug 9174 follow-up: Eliminate warning and fix POD
Jared Camins-Esakov [Tue, 1 Jan 2013 00:52:49 +0000 (19:52 -0500)]
Bug 9174 follow-up: Eliminate warning and fix POD

Thanks to Marcel for spotting these issues.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9174: Fix itemtype image display in OPAC lists
Jared Camins-Esakov [Thu, 29 Nov 2012 21:58:27 +0000 (16:58 -0500)]
Bug 9174: Fix itemtype image display in OPAC lists

Prior to this patch, C4::VirtualShelves::Page did not make sure that
the itemtype images that it chose when displaying itemtype images for
biblio-level itemtypes were for the correct interface, so
even on the OPAC the Intranet icons were requested. On standard
installations, intranet-tmpl is not available to the OPAC.

To test:
1) Set noItemTypeImages to "Show" and item-level_items to "biblio record"
2) Create a list and add an item with the default item type (942$c in
   MARC21) set to something with an itemtype image associated with it.
3) View the list in the OPAC.
4) If you are an a standard install, the itemtype image will be a broken
   link. If on a dev install, you can confirm with Firebug or the like
   that the image is pulled from /intranet-tmpl.
5) Apply patch.
6) Run `prove t/db_dependent/Koha.t` to confirm that the behavior of the
   routine used to retrieve the image URL is correct. (Note that you
   must have an item type with the code 'BK')
7) Refresh the list, noting that the display is now correct/the image is
   pulled from opac-tmpl.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
It works as expected. All tests in Koha.t passed.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9497' into 3.12-master
Jared Camins-Esakov [Thu, 31 Jan 2013 15:53:45 +0000 (10:53 -0500)]
Merge branch 'bug_9497' into 3.12-master

9 years agoBug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1
Magnus Enger [Sun, 27 Jan 2013 13:00:45 +0000 (14:00 +0100)]
Bug 9497 - Make it easier to add new encodings for Z39.50 servers and add ISO 8859-1

This patch does three things:
- Makes admin/z3950servers.pl create one variable for encoding,
  not one variable for each encoding
- Makes the template create encoding options from a list
- Adds ISO 8859-1 to the list of available encodings
See the bug for a lengthier description

To test:
- Apply the patch
- Edit one Z39.50 server several times, choosing each available
  encoding in turn
- Check that for each encoding, the correct encoding is shown both in
  the list of Z39.50 servers and in the dropdown on the edit screen

Comment: Works as described, no errors.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9486' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 19:45:09 +0000 (14:45 -0500)]
Merge branch 'bug_9486' into 3.12-master

9 years agoBug 9486: t/Letters.t loads modules in wrong order
Jared Camins-Esakov [Thu, 24 Jan 2013 18:58:07 +0000 (13:58 -0500)]
Bug 9486: t/Letters.t loads modules in wrong order

Because the unit test t/Letters.t loads C4::Letters before C4::Context,
and C4::Letters is not even vaguely thread-safe, the test tends to fail.
Usually. Moving the dbh mocking to before the use_ok('C4::Letters') test
fixes the problem.

To test:
1) Before applying patch, run `prove t/Letters.t` a few times. Note that
   it fails most of the time, if not all the time.
2) Apply patch.
3) Repeat step (1), noting that now it passes every time.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as advertised.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_6835' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 16:08:33 +0000 (11:08 -0500)]
Merge branch 'bug_6835' into 3.12-master

9 years agoBug 6835 - Ability to specify types of email address in overdue_notices.pl
Alex Arnaud [Fri, 2 Sep 2011 09:40:40 +0000 (11:40 +0200)]
Bug 6835 - Ability to specify types of email address in overdue_notices.pl

 Adds the -email option to overdue_notices.pl, which is repeatable

 -email value can be:
   - 'email'
   - 'emailpro' or
   - 'B_email'

- perltidy done
- in production for a BibLibre customer
- validated by the customer

Signed-off-by: Claire Hernandez <claire.hernandez@biblibre.com>
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_9211' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 14:58:41 +0000 (09:58 -0500)]
Merge branch 'bug_9211' into 3.12-master

9 years agoBug 9211 - days_between wrong behaviour
Tomas Cohen Arazi [Tue, 4 Dec 2012 18:32:28 +0000 (15:32 -0300)]
Bug 9211 - days_between wrong behaviour

As noted in comments #15, #16 and #17 of bug 8486, and its API,
Koha::Calendar->days_between should always returns a positive number
irrespective of the relative order of the parameters. This is still an
open bug, which arised when rewriting the Calendar.t file (Bug 9209).

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
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>
Added Paul's sign-off line, as despite it showing up in Bugzilla, it
wasn't on the patch.

9 years agoMerge branch 'bug_7243' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 14:26:37 +0000 (09:26 -0500)]
Merge branch 'bug_7243' into 3.12-master

9 years agoBug 7243: Increment version number
Jared Camins-Esakov [Thu, 24 Jan 2013 14:17:25 +0000 (09:17 -0500)]
Bug 7243: Increment version number

Database update for bug 7243 has been given version 3.11.00.015

9 years agoMerge branch 'bug_7243' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 14:17:33 +0000 (09:17 -0500)]
Merge branch 'bug_7243' into 3.12-master

9 years agoBug 7243: Rewording and renaming
Srdjan [Tue, 6 Nov 2012 01:12:14 +0000 (14:12 +1300)]
Bug 7243: Rewording and renaming

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 7243: Be selective when summing up charges for blocking issues
Srdjan [Mon, 3 Sep 2012 04:49:18 +0000 (16:49 +1200)]
Bug 7243: Be selective when summing up charges for blocking issues

Added RentalsInNoissueCharges and ManInvlsInNoissueCharges sys prefs

Created C4::Members::cwGetMemberAccountBallance()
* A wrapper for GetMemberAccountRecords that gives info on non-issue and
  other charges
* Other charges are:
  'Res'
  'Rent' if RentalsInNoissueCharges is Mo
  authorised_values MANUAL_INV if ManInvlsInNoissueCharges is No

C4::Members::GetMemberAccountRecords() changes:
* Dropped input param $date, it is not used

Use split charges in C4::Circulation::CanBookBeIssued() and
C4::Members::patronflags(). That way only fines decide whether an item
can be issued, and not other non-fine charges

Signed-off-by: Marc Veron <veron@veron.ch>
Rebased (updatedatabase.pl)

ManInvInNoissueCharges and RentalsInNoissueCharges ar both included by default (= behaviour as before)

All variants tested: Both included, none included, manual invoice included, rentals included.
Works fine, blocks/does not blok as appropirate, messages appear as expected.

[Oct 12, 2012 marcelr:] Amended for updatedatabase.pl
Signed-off-by: M. de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9402' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 13:56:37 +0000 (08:56 -0500)]
Merge branch 'bug_9402' into 3.12-master

9 years agoBug 9402: letter v between 2 option tags
Mathieu Saby [Wed, 16 Jan 2013 11:19:23 +0000 (12:19 +0100)]
Bug 9402: letter v between 2 option tags

In HTML code generated for advanced search, a useless "v" letter
is visible after "dissertation or thesis (revised)</option>".
This patch suppress "v" letter is outside <option> markup
(and cosmetic change : "Adult" -> "adult" in public types)

To test : check HTML code generated by advanced search.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes capitalization and a little problem in the HTML of an UNIMARC
plugin.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9280' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 13:43:44 +0000 (08:43 -0500)]
Merge branch 'bug_9280' into 3.12-master

9 years agoBug 9280: FIX price calculation adding an order from a staged file
Jonathan Druart [Thu, 13 Dec 2012 13:26:54 +0000 (14:26 +0100)]
Bug 9280: FIX price calculation adding an order from a staged file

Test plan:
Add an order from a staged file containing a price value (010$d for
UNIMARC user).
Check this patch with 2 different vendors (listprice=1 and listprice=0).
Check the calculated price (depending discount and gstrate).

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
introduces no new bugs
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I was unable to replicate the bug in MARC21, but the patch introduces
no regressions that I could find, so I am pushing it anyway.
Note: Acquisitions remains unusable under Plack. In order to test this
patch I first applied the patch on bug 9432.

9 years agoMerge branch 'bug_9391' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 13:11:36 +0000 (08:11 -0500)]
Merge branch 'bug_9391' into 3.12-master

9 years agoBug 9391: FIX display status in serials-collection
Jonathan Druart [Tue, 15 Jan 2013 11:03:43 +0000 (12:03 +0100)]
Bug 9391: FIX display status in serials-collection

Caused by a bad copy/paste in Bug 8782

To test:
1) Look at the detail page of any subscription
2) Click on the serial collection link in the link list on the left
3) Look at the issues, create some new issues using the "Generate next"
button
4) Check status column of the table of issues

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes template variables. Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9281' into 3.12-master
Jared Camins-Esakov [Thu, 24 Jan 2013 13:07:03 +0000 (08:07 -0500)]
Merge branch 'bug_9281' into 3.12-master

9 years agoBug 9281: FIX add an order from a staged file
Jonathan Druart [Thu, 13 Dec 2012 13:17:07 +0000 (14:17 +0100)]
Bug 9281: FIX add an order from a staged file

In GetMember the hash parameter contained
'C4::Members' => 'borrowernumber'
XXX => undef

Test plan:
In the acquition module, try to add an order to a basket from a staged file.
Without this patch, you get an error:
  DBD::mysql::st execute failed: called with 2 bind variables when 1 are needed at /home/koha/src/C4/Members.pm line 559

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, error only appearing in the log file.

Test plan:
1) Create a basket
2) Add one or multiple order lines using a staged file and the 'batch' feature.
   This is done by using the "Save" button at the bottom of the page instead
   of the "Add order" link next to a single entry.
3) Check your koha-error_log for the error above.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9343' into 3.12-master
Jared Camins-Esakov [Wed, 23 Jan 2013 01:01:22 +0000 (20:01 -0500)]
Merge branch 'bug_9343' into 3.12-master

9 years agoBug 9343: handles the new format of Debarred
Adrien Saurat [Thu, 3 Jan 2013 16:08:02 +0000 (17:08 +0100)]
Bug 9343: handles the new format of Debarred

The debarred status in DB switched from a boolean to a date.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Correctly pulls debared flag instead of debarment date.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9263' into 3.12-master
Jared Camins-Esakov [Wed, 23 Jan 2013 00:12:40 +0000 (19:12 -0500)]
Merge branch 'bug_9263' into 3.12-master

9 years agoBug 9263: Trim barcodes in offline circulation
Fridolyn SOMERS [Tue, 11 Dec 2012 16:33:11 +0000 (17:33 +0100)]
Bug 9263: Trim barcodes in offline circulation

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Passed-QA-by: M. de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9407' into 3.12-master
Jared Camins-Esakov [Tue, 22 Jan 2013 23:56:50 +0000 (18:56 -0500)]
Merge branch 'bug_9407' into 3.12-master

9 years agoBug 9407: patrons search should match substrings
MJ Ray [Wed, 16 Jan 2013 20:13:57 +0000 (20:13 +0000)]
Bug 9407: patrons search should match substrings

    If a patron lives at 4345 Library Rd, a search on Street Address for
    Library should find it. However, it does not, but a search for 4345
    Library does.  This patch adds a "Search Type" drop-down, defaulting
    to the current behaviour.

    To test:
    1) Search for a patron based on a non-leading part of a field.
    2) Should return no results.
    3) Search again with "Search Type" of "Contains".
    4) Should return the patron.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_7678' into 3.12-master
Jared Camins-Esakov [Tue, 22 Jan 2013 23:35:22 +0000 (18:35 -0500)]
Merge branch 'bug_7678' into 3.12-master

9 years agoBug 7678: Adds extended patron attributes in patron reports
Julian Maurice [Mon, 10 Dec 2012 11:23:09 +0000 (12:23 +0100)]
Bug 7678: Adds extended patron attributes in patron reports

Fix bug that prevented zero values to be shown in the results.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem with differentiating 0 and NULL values.
Passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 7678: follow-up to pass QA
Julian Maurice [Mon, 20 Aug 2012 06:57:42 +0000 (08:57 +0200)]
Bug 7678: follow-up to pass QA

Check input parameters to avoid SQL injection
Rewrite a for loop for readability

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, perlcritic is unchanged.

Test plan
- Verify ExtendedPatronAttributes hides/shows new patron attribute
  search criteria
- Verify patron attribute show up correctly
  - pull down list for attributes linked to authorized values
  - input field for other attributes
- Verify search works correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 7678: Adds extended patron attributes in patron reports
Matthias Meusburger [Fri, 20 Apr 2012 15:36:17 +0000 (17:36 +0200)]
Bug 7678: Adds extended patron attributes in patron reports

This patch allows to choose row and column amongst extended patron
attributes and to filter on them in reports/borrower_stats.pl

Signed-off-by: Marc Veron <veron@veron.ch>
Great, I was looking for such a feature.
Patch works as expected.

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 agoMerge branch 'bug_9116' into 3.12-master
Jared Camins-Esakov [Mon, 21 Jan 2013 13:55:47 +0000 (08:55 -0500)]
Merge branch 'bug_9116' into 3.12-master

9 years agoBug 9116: Remove some useless tmp variables
Jonathan Druart [Tue, 20 Nov 2012 14:57:13 +0000 (15:57 +0100)]
Bug 9116: Remove some useless tmp variables

Some variables are useless in C4::Items::PrepareItemrecordDisplay.

This patch removes its.

Test plan:
Syspref AcqCreateItem = "receive an order" and try to receive an order.
Check there is no regression.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
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_9236' into 3.12-master
Jared Camins-Esakov [Mon, 21 Jan 2013 13:40:47 +0000 (08:40 -0500)]
Merge branch 'bug_9236' into 3.12-master

9 years agoBug 9236 : Redirect to the parcel page after deleting an item/order
Jonathan Druart [Wed, 12 Dec 2012 14:14:08 +0000 (15:14 +0100)]
Bug 9236 : Redirect to the parcel page after deleting an item/order

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Receive shipment for a previously created basket with
  multiple order lines
2) Verify 'Delete order' links only have 2 parameters and
  when you delete an order, you are not redirected to the
  basket.
3) Verify the same is true for 'Delete order and catalog
  record'.
4) Apply both patches from Bug 9236.
5) Redo tests and verify page redirects correctly now.
  Links now also show the basket number as third parameter.

Also: make sure orders/items and records are deleted correctly.

Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoBug 9236: FIX delete order when receiving
Jonathan Druart [Tue, 11 Dec 2012 13:24:40 +0000 (14:24 +0100)]
Bug 9236: FIX delete order when receiving

Before this patch the "delete order" links were broken on the receiving
page (parcel.pl)

Signed-off-by: mathieu saby <mathieu.saby@univ-rennes2.fr>
Before applying the patch, when recieving a parcel,
if you delete an order line, Koha tries to open the
page of the basket linked to that order, but can
not find it. Koha displays "Vendor not found".
With the patch, Koha finds the right basket.

I Sign off this patch, to be applied with the other patch ("Redirect to the parcel page after deleting an item/order")

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9364' into 3.12-master
Jared Camins-Esakov [Sat, 19 Jan 2013 00:15:47 +0000 (19:15 -0500)]
Merge branch 'bug_9364' into 3.12-master

9 years agoBug 9364: fixes billing/delivery addresses for new baskets
Adrien Saurat [Tue, 8 Jan 2013 11:18:18 +0000 (12:18 +0100)]
Bug 9364: fixes billing/delivery addresses for new baskets

Corrects the parameters used for the NewBasket call, when
creating a new basket.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
I am passing this with a warning.  You must go back and resave the locations.
After just rereshing I got the same results but upon resubmitting the form I got the result described in the test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9357' into 3.12-master
Jared Camins-Esakov [Sat, 19 Jan 2013 00:10:34 +0000 (19:10 -0500)]
Merge branch 'bug_9357' into 3.12-master

9 years agoBug 9357: Missing 'c' option in MARC21 LEADER_18 value builder
Bernardo Gonzalez Kriegel [Mon, 7 Jan 2013 16:01:21 +0000 (13:01 -0300)]
Bug 9357: Missing 'c' option in MARC21 LEADER_18 value builder

This patch adds option 'c' to the position 18
of the leader value builder.
Also corrects label for option 'i'

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Works as described
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
9 years agoMerge branch 'bug_9348' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 18:47:52 +0000 (13:47 -0500)]
Merge branch 'bug_9348' into 3.12-master

9 years agoBug 9348 - Format dates in HOLD notices consistently
Kyle M Hall [Fri, 4 Jan 2013 13:04:25 +0000 (08:04 -0500)]
Bug 9348 - Format dates in HOLD notices consistently

Right now notices for holds awaiting pickup read something like this:

You have a hold available for pickup as of 2011-02-12.
This hold will expire if it is not picked up before: 02/22/2011.
If you no longer need this item or have any questions please contact us

Both dates should be formatting based on the dateformat system preference.

Test Plan:
1) Apply patch
2) Set the HOLD notice to the following:
    <<reserves.waitingdate>> / <<reserves.expirationdate>>
3) Place a hold for a patron
4) Enable the HOLD notice via email for that patron ( requires EnhancedMessaging )
5) Check the item in
6) Go to the borrower's Notices tab, check the body of the new HOLD notice,
   it should have two dates separated by a '/' in the format set by the dateformat
   system preference.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Patch works as advertised according to the test plan.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tested also with the HOLD_PRINT notice.

9 years agoMerge branch 'bug_9276' into 3.12-master
Jared Camins-Esakov [Fri, 18 Jan 2013 03:10:48 +0000 (22:10 -0500)]
Merge branch 'bug_9276' into 3.12-master

9 years agoBug 9276 - Display of biblio-level auth vals on OPAC search broken
Owen Leonard [Wed, 12 Dec 2012 16:43:27 +0000 (11:43 -0500)]
Bug 9276 - Display of biblio-level auth vals on OPAC search broken

If you have your MARC framework configured to link a biblio-level
field with an authorized value, and that value is linked to an
image, and the AuthorisedValueImages system preference is turned on,
the OPAC is supposed to display that image in search results
much like item type images are displayed if item-level itemtypes
are enabled. The switch to Template::Toolkit broke this feature
with a variable scope error.

This patch corrects the variable scope of the sytem preference check
and adds a check for the existence of the image so that the template
doesn't try to display broken images.

To test:

1. Turn on the AuthorisedValueImages system preference.
2. If necessary, create or configure an authorized value with images.
3. Configure a MARC framework to link a field to the authorized value. I
   chose an arbitrary field, 942e.
4. Edit a bibliographic record and set a value for the MARC field
   you configured.
5. Make sure Zebra has reindexed, and perform an OPAC search which
   will include the record you edited. With AuthorisedValueImages
   ON, you should see the correct authorized value image.
6. With AuthorisedValueImages OFF, you should see no image.
7. Turn AuthorisedValueImages back on. Edit the authorized value again
   and configure it with no image. Perform your search again. You should
   see no image.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>