koha.git
8 years agoBug 9570 - view plain not working in ccsr
Owen Leonard [Tue, 12 Feb 2013 16:05:07 +0000 (11:05 -0500)]
Bug 9570 - view plain not working in ccsr

The code in opac-showmarc.pl isn't smart enough to find the xsl files in
the "default" (prog) theme if the ccsr theme is enabled, so the "view
plain" option on opac-MARCdetail.pl fails ever time.

This patch copies some path-handling code from XSLT.pm to improve xsl
file path handling when dealing with a "sub-theme."

To test, view the MARC view in the OPAC and click the "view plain" link.
This should work correctly in prog and ccsr themes and with different
languages enabled (keeping in mind the ccsr theme will fail in general
for languages other than en).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked plain view works in both prog and ccsr themes now.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9620' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:31:29 +0000 (09:31 -0500)]
Merge branch 'bug_9620' into 3.12-master

8 years agoBug 9620: IncludeSeeFromInSearches and data in $9 subfields can break indexing
Katrin Fischer [Fri, 15 Feb 2013 16:55:38 +0000 (17:55 +0100)]
Bug 9620: IncludeSeeFromInSearches and data in $9 subfields can break indexing

In Germany 020$9 is used to store the ISBN with hyphens. In rare cases this
can break indexing in combination with IncludeSeeFromInSearches.

To reproduce:
1) Change your frameworks:
  * Make sure 084 $a is visible
  * Create a 084 $9 that you link to PERSO_NAME authorities.
2) Create a record or edit an existing one:
  * Use the plugin on 084 to link the record to an authority.
  * Make sure 400 is filled in your authority record.

Preparations all done, now test indexing:

3) Make sure IncludeSeeFromInSearches is OFF
  * Reindexing should work without any problems.

4) Activate IncludeSeeFromInSearches
  * Reindexing should throw an error and stop:
    201.Subfields are only for data fields (generally,
    just tags >= 010 at /home/koha/Koha/Filter/MARC/EmbedSee
    FromHeadings.pm line 94

5) Apply patch and reindex.
  * No error should occur.
  * Test 4xx fields from other tags were properly indexed.

What causes the problem is the fact, that Koha tries to store
the date from the 400 in the bibliographic record for indexing.
For this it calculates a tag in the bibliographic record from the
tag it found the authority link in and the 4xx tags used in the
authority record. If you have an authority linked to a 0xx field
and the matching authority has a 4xx where xx < 10, the calculated
tag will be a control field. The attempt to add subfields to this
control field, is causing the error and breaks the indexing process.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, and is a long description :)
Test:
1) Enabled 084 (all subfields visible), added 084_9 (missing from
default framework) linked to PERSO_NAME
2) Edited authority record and added some data to 400
3) Edited bib record, linked 084 to previous auth record
4) With IncludeSeeFromInSearches OFF, re-index without problem
5) With IncludeSeeFromInSearches ON, re-index problems!!!
====================
exporting biblio
====================
1...Subfields are only for data fields (generally, just tags >= 010) at...
Abort
6) Applied patch
7) With IncludeSeeFromInSearches ON, re-index without problem
...
====================
5001....................................................................................................
Records exported: 5060
====================
...
====================
2001....................................................................................................
Records exported: 2024
====================
CLEANING
====================
Good!

*) That's "works as described", don't know if other tests are needed.

No errors from koha-qa

Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9653' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:28:55 +0000 (09:28 -0500)]
Merge branch 'bug_9653' into 3.12-master

8 years agoBug 9653: FIX collapse class is used by already Bootstrap
Jonathan Druart [Tue, 19 Feb 2013 15:58:50 +0000 (16:58 +0100)]
Bug 9653: FIX collapse class is used by already Bootstrap

Quick, simple and dirty fix.

Test plan:
Apply this patch and check that filters are present on the suggestion
management page.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Filters are back on the page, regression fixed.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9656' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:27:06 +0000 (09:27 -0500)]
Merge branch 'bug_9656' into 3.12-master

8 years agoBug 9656: Followup Make logging to a file optional (for fines)
Jonathan Druart [Thu, 28 Feb 2013 13:09:24 +0000 (14:09 +0100)]
Bug 9656: Followup Make logging to a file optional (for fines)

The -log option become optional if the -output_dir is given.

Test plan:
call the script with
1/ no one parameter : no log file
2/ -l : log file will be created in /tmp
3/ -o=/home/koha/var/log : log file with be created in the specified
4/ -o=/home/koha/var/log -l: Same as 3/

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All combination of options tested. Works well. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9656: Make logging to a file optional (for fines)
Chris Cormack [Thu, 21 Feb 2013 09:10:48 +0000 (22:10 +1300)]
Bug 9656: Make logging to a file optional (for fines)

To test:
1/ Before the patch run misc/cronjobs/fines.pl
   Notice that a file has been written to /tmp

2/ rm the file

3/ Apply the patch and run the script again
   Notice the file is not created

4/ run the script with -l
   Notice the file is created again

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Now it work as described. No errors.
Signed-off-by: Elliott Davis <elliott@bywatersolions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8620' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:19:46 +0000 (09:19 -0500)]
Merge branch 'bug_8620' into 3.12-master

8 years agoBug 8620: Any index in DOM mode sensitive to -x flag of rebuild_zebra.pl
Jared Camins-Esakov [Mon, 4 Mar 2013 21:10:34 +0000 (16:10 -0500)]
Bug 8620: Any index in DOM mode sensitive to -x flag of rebuild_zebra.pl

The definition of the Any index was sensitive to whether
spaces were present between (say) subfield elements in the
MARCXML representation of the bib being indexed.  When using
the -x option to rebuild_zebra.pl, spaces would be present
because of how MARC::File::XML emits MARCXML.

When not using the -x option, spaces would not be present
and the contents of a field would be run together, potentially
as one big token.

The visible behavior was that doing a keyword search by
item barcode would sometimes not work.

To test:
0) Make sure Zebra is using DOM mode
1) Create an item record.
2) Reindex using rebuild_zebra.pl -b -z, *without* -x
3) Do a keyword search by the barcode of the item just
   added; the search shouldn't work
4) Apply patch.
5) Update the following two files:
    etc/zebradb/marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl
    etc/zebradb/xsl/koha-indexdefs-to-zebra.xsl
6) Reindex
7) Do a search that was previously failing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes the problem for me - formerly not working callnumbers
and barcodes are now found in keyword (any) searches.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(revised commit description to better explain why it fixes the problem)

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Passes all my tests, happy to sign off
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9574' into 3.12-master
Jared Camins-Esakov [Thu, 7 Mar 2013 14:17:53 +0000 (09:17 -0500)]
Merge branch 'bug_9574' into 3.12-master

8 years agoBug 9574: Plack fixes for serials/subscription-add.pl
Jared Camins-Esakov [Sun, 10 Feb 2013 18:25:44 +0000 (13:25 -0500)]
Bug 9574: Plack fixes for serials/subscription-add.pl

This patch fixes the following warnings under Plack:
* Use of uninitialized value $firstissuedate in string eq at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 92.
* Use of uninitialized value $firstissuedate in substr at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 105.
* Use of qw(...) as parentheses is deprecated at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 95.
* Variable "$firstissuedate" is not available at \
    /home/jcamins/kohaclone/serials/subscription-add.pl line 338.

To test:
1) Create a subscription. Ensure that setting the first issue's
   publication date works.
2) Edit a subscription. Ensure that the first issue's publication
   date shows up.
3) Sign off.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No regressions found, all tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9445' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:25:33 +0000 (12:25 -0500)]
Merge branch 'bug_9445' into 3.12-master

8 years agoBug 9445 [Revised] Use DataTables in local use system preferences editor
Owen Leonard [Tue, 22 Jan 2013 17:37:08 +0000 (12:37 -0500)]
Bug 9445 [Revised] Use DataTables in local use system preferences editor

Replace the tablesorter plugin with the DataTables plugin in the
local use system preferences editor.

This patch moves embedding of the toolbar and table-sorting JS from
within the body of the page to the <head> for sake of consistency.

To test, open the system preferences editor to the Local Use tab.
Confirm that table sorting works correctly. In this configuration there
should be no pager and no results filtering.

Revision corrects template path to datatables assets.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Tab sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Further revision removes old tablesorter code
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9674' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:22:10 +0000 (12:22 -0500)]
Merge branch 'bug_9674' into 3.12-master

8 years agoBug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap
Owen Leonard [Wed, 20 Feb 2013 17:58:46 +0000 (12:58 -0500)]
Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap

This patch converts the toolbar on acquisitions pages to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view acquisitions pages and confirm that buttons look correct
and work correctly:

- acqui-home.pl (Acquisitions home page)
- booksellers.pl (Acquisitions -> Vendor search)
- supplier.pl (Acquisitions -> Vendor search -> Vendor)
- aqcontract.pl (Acquisitions -> Vendor search -> Vendor -> Contracts)
- uncertainprice.pl (Aquisitions -> Vendor search -> Vendor -> Uncertain
  prices)

View these pages for vendors with and without orders.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Buttons works. No errors.
Tested vendors with and without orders (delete button in last case)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, changes are consistent.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9675' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:20:12 +0000 (12:20 -0500)]
Merge branch 'bug_9675' into 3.12-master

8 years agoBug 9675 - Replace YUI buttons on authorities home page with Bootstrap
Owen Leonard [Thu, 21 Feb 2013 19:37:18 +0000 (14:37 -0500)]
Bug 9675 - Replace YUI buttons on authorities home page with Bootstrap

This patch converts the toolbar include file used by the
authorities home page and authority view page
(authorities-home.pl and authorities/detail.pl) replacing YUI button
and menu code with Bootstrap.

To test:

- View the authorities home page and confirm that the "New
  authority" button looks correct and works correctly.
- Search for an existing authority and click the "Details" link to view.
  "Edit," "Delete," "Save," and "New authority" buttons should look
  correct and work correctly. The "Delete" button should only appear for
  authorities which are unused.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Now it works. New and all operations on existing auth works.
No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9397' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:18:19 +0000 (12:18 -0500)]
Merge branch 'bug_9397' into 3.12-master

8 years agobug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility...
Corey Fuimaono [Tue, 15 Jan 2013 21:48:03 +0000 (10:48 +1300)]
bug 9397 - Error Messages hard to find for Visually Impaired Users (Accessibility) [Returning Items] {REVISION 1.1}

testing procedure:
1. Check in Invalid Item
2. See that new header has been added. "Can't Check in"

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
A followup may come that makes this text invisible, but this helps accessibility a great dea, and passes validation.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: replace "Can't Check in" with "Cannot check in" and
delete a h3 element with the same text in order to avoid duplicated
messages.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9520' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:12:28 +0000 (12:12 -0500)]
Merge branch 'bug_9520' into 3.12-master

8 years agoBug 9520: Increment version number
Jared Camins-Esakov [Sat, 2 Mar 2013 17:09:26 +0000 (12:09 -0500)]
Bug 9520: Increment version number

Database update for bug 9520 has been given version 3.11.00.023

8 years agoBug 9520 -[Revised] - Update default LOC Z39.50 target
Bernardo Gonzalez Kriegel [Thu, 31 Jan 2013 19:11:01 +0000 (16:11 -0300)]
Bug 9520 -[Revised] - Update default LOC Z39.50 target

This patch updates (if present) target settings
of Library of Congress Z39.50 server.

Revision: Was trying to update wrong column 'type',
now correct column 'syntax'.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: add the SetVersion call
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9617' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 17:07:06 +0000 (12:07 -0500)]
Merge branch 'bug_9617' into 3.12-master

8 years agoMerge branch 'bug_9617' into 3.12-master
Jared Camins-Esakov [Sat, 2 Mar 2013 16:58:50 +0000 (11:58 -0500)]
Merge branch 'bug_9617' into 3.12-master

8 years agoBug 9617 - Replace YUI menu on catalog pages with Bootstrap
Owen Leonard [Wed, 30 Jan 2013 17:25:21 +0000 (12:25 -0500)]
Bug 9617 - Replace YUI menu on catalog pages with Bootstrap

This patch converts the toolbar include file used by catalog detail
pages (detail.pl, MARCdetail.pl, etc.) replacing YUI button and menu
code with Bootstrap.

Minor change to staff client CSS fixes issue with language footer.
Minor change to doc-head-close.inc corrects error in logic for handling
cart and lists js discovered in testing.

To test, view any page which uses cat-toolbar.inc. Buttons and menus
should look correct and work correctly. Functions to test include:

New record
New item
New subscription
New child record

Edit record
Edit items
Edit items in a batch
Delete items in a batch
Attach item
Edit as new (duplicate)
Replace record via Z39.50
Delete record
Delete all items

Save (various formats)

Add to cart
Add to list

Print

Place hold (including with search-to-hold active).

Testing should be done by users with varying permissions including with
and without:

CAN_user_serials_create_subscription
CAN_user_editcatalogue_edit_catalogue
CAN_user_editcatalogue_edit_items
CAN_user_tools_items_batchmod
CAN_user_tools_items_batchdel

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All buttons tested. Works as described. No Errors.
Looks good.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_3549' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:30:36 +0000 (19:30 -0500)]
Merge branch 'bug_3549' into 3.12-master

8 years agoBug 3549 -[Revised]- Framework sorting in addbook
Bernardo Gonzalez Kriegel [Thu, 21 Feb 2013 17:37:07 +0000 (14:37 -0300)]
Bug 3549 -[Revised]- Framework sorting in addbook

Reviewing Bug 9649, this bug comes up.

This patch correctly sort frameworks by description.

To test:
1) Go to Cataloguing home, button 'New record' shows
unordered list of frameworks
2) Apply the patch
3) refresh, the list must be correctly sorted.

Revised to sort using uppercase.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9555' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:16:04 +0000 (19:16 -0500)]
Merge branch 'bug_9555' into 3.12-master

8 years agoBug 9555: Template files contain single quote strings
Jonathan Druart [Wed, 6 Feb 2013 15:34:34 +0000 (16:34 +0100)]
Bug 9555: Template files contain single quote strings

Test plan:
- launch the test xt/single_quotes.t, there are 3 occurrences
- apply this patch
- launch the test. It will pass with success
- Check that there is no regression on the 2 modified intranet files and
  the calendar still works at the OPAC.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests pass, also checked calendar still works.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9669' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:14:49 +0000 (19:14 -0500)]
Merge branch 'bug_9669' into 3.12-master

8 years agoBug 9669 - Replace YUI buttons on staff client cart toolbar
Owen Leonard [Tue, 19 Feb 2013 20:18:27 +0000 (15:18 -0500)]
Bug 9669 - Replace YUI buttons on staff client cart toolbar

This patch converts the toolbar on the staff client cart
page to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the staff client cart and confirm that all buttons look
correct and work correctly. Functions to test include:

Full/brief display
Send
Download (various options)
Print
Empty and close
Hide window

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Tested all buttons, works very well. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_5333' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:11:27 +0000 (19:11 -0500)]
Merge branch 'bug_5333' into 3.12-master

8 years agoBug 5333 - z3950 normalization should apply only on UNIMARC
Tomas Cohen Arazi [Wed, 27 Feb 2013 13:47:13 +0000 (10:47 -0300)]
Bug 5333 - z3950 normalization should apply only on UNIMARC

It's been a while since this bug is around. This normalization is only
used for UNIMARC and yields a fatal error when those variables are set
on (at least) MARC21 setups.

Regards
To+

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: update comment
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9663' into 3.12-master
Jared Camins-Esakov [Fri, 1 Mar 2013 00:07:59 +0000 (19:07 -0500)]
Merge branch 'bug_9663' into 3.12-master

8 years agoBug 9663 - Individual bibliographic record "Save" option requires export permission
Owen Leonard [Tue, 19 Feb 2013 17:10:40 +0000 (12:10 -0500)]
Bug 9663 - Individual bibliographic record "Save" option requires export permission

This patch corrects permission on the export option available on
catalogue pages in the staff client (detail.pl, MARCdetail.pl, etc) so
that users no longer require "export_catalogue" permission.
"export_catalogue" permission is required only for tools/export.pl.

This patch also corrects some crazy nearby indentation. Sorry, couldn't
resist.

To test, visit a page like detail.pl with and without "export_catalogue"
permission. It should be possible to save the record as MODS, MARCXML,
MARC, etc. without error.

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>
8 years agoMerge branch 'bug_8942' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:29:01 +0000 (10:29 -0500)]
Merge branch 'bug_8942' into 3.12-master

8 years agoBug 8942 : Adding a test to make sure we don't use single quotes for js
Chris Cormack [Sat, 2 Feb 2013 06:59:42 +0000 (19:59 +1300)]
Bug 8942 : Adding a test to make sure we don't use single quotes for js

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested by adding single quotes to a translation-escaped string.
Test correctly failed it.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9587' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:18:54 +0000 (10:18 -0500)]
Merge branch 'bug_9587' into 3.12-master

8 years agoBug 9587: Increment version number
Jared Camins-Esakov [Sun, 24 Feb 2013 15:18:43 +0000 (10:18 -0500)]
Bug 9587: Increment version number

Database update for bug 9587 has been given version 3.11.00.022

8 years agoBug 9587 : Handling mismatched emails better
Chris Cormack [Wed, 20 Feb 2013 22:34:41 +0000 (11:34 +1300)]
Bug 9587 : Handling mismatched emails better

To test:

Sign in to Koha via persona using an email that doesn't exist in Koha

Before the patch you will get into an infinite redirect loop

After the patch it will give you an error message

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9587 : QA follow up - fix one tabulation character
Katrin Fischer [Sun, 17 Feb 2013 15:20:48 +0000 (16:20 +0100)]
Bug 9587 : QA follow up - fix one tabulation character

Makes QA script happy.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9587 Follow up to fix the problem Katrin identified
Chris Cormack [Sun, 17 Feb 2013 09:44:01 +0000 (22:44 +1300)]
Bug 9587 Follow up to fix the problem Katrin identified

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Solve that problem, but now koha-qa complains about tabs
in C4/Context.pm.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests done:
1) System preference 'Persona' added correctly.
2) Persona off, normal login still possible
3) Persona on, Persona login works
4) Persona logout works
5) normal login still possible
6) normal logout still possible

Persona is off by default and uses the primary email address
from the patron account.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9587 : Followup removing a commented out warn that was annoying the qa tools
Chris Cormack [Tue, 12 Feb 2013 01:16:35 +0000 (14:16 +1300)]
Bug 9587 : Followup removing a commented out warn that was annoying the qa tools

Not introduced by this work but no reason not to clean it

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: no more complains from koha-qa

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9587 : Follow up, fixing tabs in C4/Auth.pm
Chris Cormack [Mon, 11 Feb 2013 18:35:07 +0000 (07:35 +1300)]
Bug 9587 : Follow up, fixing tabs in C4/Auth.pm

And translation problem in masthead.inc

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9587 : Mozilla Persona login
Chris Cormack [Mon, 11 Feb 2013 09:34:20 +0000 (22:34 +1300)]
Bug 9587 : Mozilla Persona login

    Working on Mozilla Persona support (browser id)

    This will let a user log into Koha using browser id, if their email
    address used matches the email address inside Koha.

    Once an assertion is received, we simply need to find the user that
    matches that email address, and create a session for them.

    opac/svc/login handles this part.

    The nice thing about it is, the user doesn't have to do anything, like
    linking their account. As long as the email address they are using to
    identify themselves in browserid is the same as the one in Koha it
    will just work.

    This is covered by a systempreference, to allow people to do it, and
    is of course totally opt in, it works alongside normal Koha (or any
    other method) of login. So only those choosing to use it, need use it

Test Plan

1/ Make sure OPACBaseURL is set correctly
2/ Switch on the Persona syspref
3/ Make a borrower (or edit one) to have the email you plan to use as
the primary email
4/ Click sign in with email, make or use a persona account
5/ Logout
6/ Check you can still login and logout the normal way

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works great.
It's not browser dependent, but tested with chrome, firefox, opera and safari.
Old an new login system works.
Minor errors, addresed in follow-up.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8682' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:10:32 +0000 (10:10 -0500)]
Merge branch 'bug_8682' into 3.12-master

8 years agoBug 8682 - Renewals do not appear on quick slips
Liz Rea [Thu, 31 Jan 2013 01:53:29 +0000 (14:53 +1300)]
Bug 8682 - Renewals do not appear on quick slips

To test:
Issue two books to a patron.
Do a renewal on one of them.
update the issuedate on the item that has been renewed to something before today (renewals on the same day will work even without this patch)
I did: select * from issues;
update issues set issuedate="2013-01-25 14:00:00" where itemnumber = 948; (itemnumber is variable depending on your test data.)

Print a quick slip before the patch - the renewal will not show up as one of today's issues.
Print a quick slip after the patch - the renewal will show up as one of today's issues.

If you need reasoning as to why a renewal should show up on the quick slip, think of it as a record of everything
a borrower did today, without the hassle of overdues.

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>
8 years agoMerge branch 'bug_9356' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 15:00:57 +0000 (10:00 -0500)]
Merge branch 'bug_9356' into 3.12-master

8 years agoBug 9356: Show Dissertation note (MARC21 502) in XSLT
Katrin Fischer [Tue, 8 Jan 2013 09:17:40 +0000 (10:17 +0100)]
Bug 9356: Show Dissertation note (MARC21 502) in XSLT

Shows dissertation note in OPAC and intranet detail pages.

To test:
1) Look at records with and without 502 in intranet and OPAC
2) Verify display is correct and consistent

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass in staff and opac
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9356: Follow-up - fix capitalization in MARC21 XSLT detail pages
Katrin Fischer [Tue, 8 Jan 2013 09:44:11 +0000 (10:44 +0100)]
Bug 9356: Follow-up - fix capitalization in MARC21 XSLT detail pages

Fixes spelling to follow capitalization rules in OPAC and intranet MARC21
detail pages.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Changes all look good.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9363' into 3.12-master
Jared Camins-Esakov [Sun, 24 Feb 2013 14:58:05 +0000 (09:58 -0500)]
Merge branch 'bug_9363' into 3.12-master

8 years agoBug 9363: Show Patent control information and report number (MARC21, XSLT, detail...
Katrin Fischer [Tue, 8 Jan 2013 12:18:49 +0000 (13:18 +0100)]
Bug 9363: Show Patent control information and report number (MARC21, XSLT, detail pages)

Adds 088 $a and 013 $a,c,d,e,f to OPAC and intranet detail pages for MARC21 and XSLT.

To test:
 1) Check records with single and multiple 013 and 088 fields with different subfields catalogued.
 2) Check records with no 088 or 013 present.
 3) Verify display is ok and consistent.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Verified in opac and staff client by following all tests.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9662' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:56:00 +0000 (09:56 -0500)]
Merge branch 'bug_9662' into 3.12-master

8 years agoBug 9662: Followup for acquisition
Marcel de Rooy [Wed, 20 Feb 2013 12:37:16 +0000 (13:37 +0100)]
Bug 9662: Followup for acquisition

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Trivial change corresponding with Dobrica's patch at cataloging side.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 9662 - ISSN search field not passed to Z3950Search
Dobrica Pavlinusic [Tue, 19 Feb 2013 14:58:35 +0000 (15:58 +0100)]
Bug 9662 - ISSN search field not passed to Z3950Search

Seems like simple omission when passing $pars hash to
Z3950Search function.

Test scenario:

1. select any Z39.50 search form and enter valid ISSN
2. verify that you don't get any results from remote servers
3. apply this patch and re-check that results are now availble
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_5888' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:52:35 +0000 (09:52 -0500)]
Merge branch 'bug_5888' into 3.12-master

8 years agoBug 5888: Increment version number
Jared Camins-Esakov [Wed, 20 Feb 2013 14:52:27 +0000 (09:52 -0500)]
Bug 5888: Increment version number

Database update for bug 5888 has been given version 3.11.00.021

8 years agoBug 5888: Followup for preference description
Marcel de Rooy [Fri, 15 Feb 2013 10:53:58 +0000 (11:53 +0100)]
Bug 5888: Followup for preference description

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Added for trivial string change in finalizing QA.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 5888: Add label for each entry in the authors list
Jonathan Druart [Mon, 11 Feb 2013 11:30:56 +0000 (12:30 +0100)]
Bug 5888: Add label for each entry in the authors list

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 5888: Followup add a syspref (OPACPopupAuthorsSearch)
Jonathan Druart [Mon, 11 Feb 2013 11:28:37 +0000 (12:28 +0100)]
Bug 5888: Followup add a syspref (OPACPopupAuthorsSearch)

New syspref OPACPopupAuthorsSearch.
If it is disabled, the development has no effect.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 5888: Fix building of query in authors links
Julian Maurice [Wed, 19 Sep 2012 13:38:12 +0000 (15:38 +0200)]
Bug 5888: Fix building of query in authors links

'all' checkbox was taken into account, resulting in the string 'on and'
added to beginning of query.

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>
8 years agoBug 5888: opac-detail subject/author links improvements
Julian Maurice [Wed, 23 May 2012 09:00:17 +0000 (11:00 +0200)]
Bug 5888: opac-detail subject/author links improvements

When the user clicks on a subject or an author, the list of subjects
(authors) is displayed and the user can choose more than 1 subject
(author) to search on.
Also added a link to opac-authoritiesdetail.pl when possible.

Only affects 'Normal view'. Does not affect XSLT display.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split out of the original patch for bug 5888. The links to the
authority records are added by bug 8210.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
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>
8 years agoMerge branch 'bug_8913' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:17:36 +0000 (09:17 -0500)]
Merge branch 'bug_8913' into 3.12-master

8 years agoBug 8913 [Revised] Improve acquisitions navigation
Owen Leonard [Fri, 12 Oct 2012 19:55:16 +0000 (15:55 -0400)]
Bug 8913 [Revised] Improve acquisitions navigation

This patch adds a new menu for vendor-related pages in which
vendor related "views" can be linked to: baskets, basket groups,
contracts, invoices, uncertain prices.

The acquisitions toolbar is pared down to vendor-related actions:
New basket, contract, or vendor; edit vendor, delete vendor,
receive shipment.

Other small improvements have been made to other pages: corrections
to breadcrumbs and title tags, adding useful links betweeen pages.

Vendor menu and toolbar are added to booksellers.pl
when there is only one "search result" (i.e. a vendor id is passed).

- Menu appears when booksellerid variable is present
- Redundant heading removed
- Additional variables added to enable proper display of the toolbar

- Revision corrects broken links pointed out by QA.
- Revision adds check of existing baskets and subscriptions as a
  condition on display of the vendor delete button.

TODO: Add coverage of Basket groups page.

To test, navigate Acquisitions pages and test as many links and buttons
as you can, confirming that nothing is broken on vendor pages, invoice
pages, contract pages, uncertain price pages, etc.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass - I like this very much!

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

Tests done:
1) New toolbar - vendor search
  - no results = button to create new vendor shows
  - 1 result = additional new options show
  - more than one result = button to create new vendor shows

2) Vendor views
  - acq toolbar consistent with 1 result in vendor search
  - new tabs on the left
  - checked all links have the needed parameters and work correctly

3) New toolbar - different pages
  - Toolbar is formatted consistently
  - Delete vendor shows only up when it should - no baskets or
    subscriptions
  - Links work correctly

Works nicely, great groundwork for further improvements.

TODO Add new toolbar to (new) invoices page.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_8347' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 14:07:45 +0000 (09:07 -0500)]
Merge branch 'bug_8347' into 3.12-master

8 years agoBug 8347: Increment version number
Jared Camins-Esakov [Wed, 20 Feb 2013 14:07:31 +0000 (09:07 -0500)]
Bug 8347: Increment version number

Database update for bug 8347 has been given version 3.11.00.020

8 years agoBug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Vitor FERNANDES [Wed, 5 Dec 2012 15:34:24 +0000 (15:34 +0000)]
Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'

Changed Charset.pm to use defaultlanguage instead of 'fre'.

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

1) Check system preference was added correctly:
   UNIMARCField100Language
2) Change code in preference to be not 'fre'.
3) Catalog a bibliographic record.
  - check plugin shows new value
  - check empty field is filled with new value from the plugin
  - check you can still edit it to be something else

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Vitor FERNANDES [Tue, 4 Dec 2012 16:18:57 +0000 (16:18 +0000)]
Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'

Forget to add the system preference to the template.

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoBug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Vitor FERNANDES [Thu, 29 Nov 2012 11:02:16 +0000 (11:02 +0000)]
Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'

Added a new system preference to set the UNIMARC field 100 default language.
The default value for that system preference is 'fre'.
Changed Biblio.pm to use the system preference:

- if the language is bad filled in the preferences it uses 'fre' as default value
- only replaces the language when the field 100 is empty
- if the language is filled with the plugin only replaces the positions 25-28 to 'y50'

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9145' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:42:29 +0000 (08:42 -0500)]
Merge branch 'bug_9145' into 3.12-master

8 years agoBug 9145: Increment version number
Jared Camins-Esakov [Wed, 20 Feb 2013 13:42:14 +0000 (08:42 -0500)]
Bug 9145: Increment version number

Database update for bug 9145 has been given version 3.11.00.019

8 years agoBUG 9145: Authorities: standard language for UNIMARC
Vitor FERNANDES [Mon, 26 Nov 2012 12:28:39 +0000 (12:28 +0000)]
BUG 9145: Authorities: standard language for UNIMARC

New Authority system preference created UNIMARCAuthorityField100 with default value "afrey50      ba0".
AuthoritiesMarc.pm uses the system preference instead of label "afrey50      ba0".

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, all tests and QA script pass.

1) Check system preference is created correctly.
2) Change pref.
3) Catalog a new authority.
4) Change framework to make 100 show in frameworks or check in the
   the database, that now 100 has the new defined value.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9615' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:29:35 +0000 (08:29 -0500)]
Merge branch 'bug_9615' into 3.12-master

8 years agoBug 9615 - Combine staff home page images into single sprite
Owen Leonard [Thu, 14 Feb 2013 16:31:48 +0000 (11:31 -0500)]
Bug 9615 - Combine staff home page images into single sprite

In order to reduce the number of concurrent downloads on the staff
client home page the images representing the various modules (circ,
patrons, etc) could be combined into one sprite.

This patch creates a new sprite containing all images and corrects the
CSS for the default and hover states of each link to match the previous
version. The separate images have been removed. Also added is a
GIMP-compatible Photoshop file from which the sprite is generated.

To test, apply the patch, clear your browser cache, and view the staff
client home page. Each module icon should look correct in its default
and hover states.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described, Good idea! No errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9625' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:27:31 +0000 (08:27 -0500)]
Merge branch 'bug_9625' into 3.12-master

8 years agoBug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap
Owen Leonard [Thu, 31 Jan 2013 15:59:46 +0000 (10:59 -0500)]
Bug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap

This patch converts the toolbar include file used by guided/SQL report
pages to Bootstrap, replacing YUI button and menu code with Bootstrap
markup.

To test, view any page in reports/ which uses reports-toolbar.inc
(Saved reports, Guided reports, SQL reports). Buttons and menus should
look correct and work correctly.

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, logic is correct. Toolbar differs, depending
on the action: show report, list of reports, edit report.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9650' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:25:35 +0000 (08:25 -0500)]
Merge branch 'bug_9650' into 3.12-master

8 years agoBug 9650 - Show message if there are no notices
Owen Leonard [Sun, 17 Feb 2013 00:11:52 +0000 (19:11 -0500)]
Bug 9650 - Show message if there are no notices

When there are no notices for the selected library, the
interface displays a table header with an empty table.

This patch adds a message which appears when there are no
notices for the selected library, or if no library selected
and there are no notices at all.

To test, visit the notices and slips page and
select a library for which there are no notices. A message
should be displayed, "There are no notices for this library."

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9455' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:23:16 +0000 (08:23 -0500)]
Merge branch 'bug_9455' into 3.12-master

8 years agoBug 9455: Remove unnecessary quoting from sql
Colin Campbell [Wed, 23 Jan 2013 10:31:31 +0000 (10:31 +0000)]
Bug 9455: Remove unnecessary quoting from sql

Wa've removed the mysql specific back quotes from sql files
But this case remained of them embedded in an sql string
Also removed the unnecessary call to finish
and temporary variable in the subroutine return

Testing: Functionality should remain unchanged. Retrieval of
basketgroups in acquisitions should not be affected

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works according to test instructions: Basketgroups
functionality appears to work normally.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked SQL produces the same results as before and did some
tests on the basket group functionality.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9658' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:22:00 +0000 (08:22 -0500)]
Merge branch 'bug_9658' into 3.12-master

8 years agoBug 9658: Incorrect breadcrumb on report dictionary
Jared Camins-Esakov [Mon, 18 Feb 2013 13:16:01 +0000 (08:16 -0500)]
Bug 9658: Incorrect breadcrumb on report dictionary

Prior to this patch, the breadcrumb on the reports dictionary looks
like this: Home > Reports > Guided reports wizard Dictionary (notice
the lack of punctuation between "wizard" and "Dictionary").
This patch makes it consistent with the rest of the system so it looks
like this: Home > Reports > Guided reports wizard > Dictionary

I left dictionary bolded, since that seems to have been intentional,
even if I can't find a good reason for it.

To test:
1) View reports dictionary page before and after patch is applied,
   observing difference.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Trivial patch. Work as described. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9655' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:20:50 +0000 (08:20 -0500)]
Merge branch 'bug_9655' into 3.12-master

8 years agoBug 9655 - Capitalization wrong on 'Close and Print' button in basket groups
Bernardo Gonzalez Kriegel [Sun, 17 Feb 2013 23:22:45 +0000 (20:22 -0300)]
Bug 9655 - Capitalization wrong on 'Close and Print' button in basket groups

This patch fix button capitalization on basket groups for a vendor.

To test:
1) Go to Acquisitions, search for a vendor, click on vendor name,
Manage orders > Basquet groups
2) On Open tab, action button "Close and Print" has incorrect capitalization.
3) Apply the patch
4) Reload or repeat 1-2, capitalization fixed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9582' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:17:36 +0000 (08:17 -0500)]
Merge branch 'bug_9582' into 3.12-master

8 years agoBug 9582: Remove unused code from members/pay.pl
Jared Camins-Esakov [Sun, 10 Feb 2013 15:39:20 +0000 (10:39 -0500)]
Bug 9582: Remove unused code from members/pay.pl

The subroutines writeoff() and get_writeoff_sth() (and the two package
variables $writeoff_sth and $add_writeoff_sth) defined in members/pay.pl
are not used at all.

To test:
1) View members/pay.pl by looking at the record of a patron who has
   at least seven fines/fees and clicking the "Pay fines" tab after
   clicking the "Fines" tab on the left side
2) Write off a single item in the table on members/pay.pl using the
   button labelled "Write off"
3) Pay a single fine by clicking the "Pay" button
4) Pay a portion of a fine by selecting a checkbox on one of the lines
   in the table and clicking the "Pay amount" button
5) Select two lines in the table and click the "Pay selected" button
6) Write off all remaining fines

If all your actions show up in the table on the Account tab, this patch
works.

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>
8 years agoMerge branch 'bug_8079' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:16:28 +0000 (08:16 -0500)]
Merge branch 'bug_8079' into 3.12-master

8 years agoBug 8079 - opac not showing fines - says 'no'
Kyle M Hall [Tue, 12 Feb 2013 15:54:23 +0000 (10:54 -0500)]
Bug 8079 - opac not showing fines - says 'no'

Make charges of type FU be counted for opac-user.pl

Test Plan:
1) Checkout an item to a patron, back date the date due enough to create fines
2) Run fines.pl
3) Log into the patron's account via the OPAC
4) Note the fines line for that issue says 'No'
5) Apply patch
6) Reload opac-user.pl, not the fines column now says 'Yes'

Signed-off-by: David Cook <dcook@prosentient.com.au>
Works great, Kyle. Seeing as my test patron had $4500 in fines for that item, I was glad to see that column switch to "Yes" ;).

I'm not sure what the difference is between FU and F is, or what L means, but the patch works, so I'm signing off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described, all tests and QA script are ok.
Note: why show yes and not the fine amount?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9651' into 3.12-master
Jared Camins-Esakov [Wed, 20 Feb 2013 13:00:42 +0000 (08:00 -0500)]
Merge branch 'bug_9651' into 3.12-master

8 years agoBug 9651 - When deleting a fund, button is wrongly labelled with 'Delete this budget'
Bernardo Gonzalez Kriegel [Sun, 17 Feb 2013 13:19:55 +0000 (10:19 -0300)]
Bug 9651 - When deleting a fund, button is wrongly labelled with 'Delete this budget'

This patch change legends to approve/cancel deletion of a fund.
Changed to Delete/Cancel, same messages to delete a Budget.

To test:
1) When deleting a fund, confirmation messages said:
'Delete this budget XXX?' to approve
'No, do not delete' to cancel
2) Apply the patch
3) Now the messages are 'Delete'/'Cancel'

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_7969' into 3.12-master
Jared Camins-Esakov [Tue, 19 Feb 2013 16:04:52 +0000 (11:04 -0500)]
Merge branch 'bug_7969' into 3.12-master

8 years agoMerge branch 'bug_9646' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:11:25 +0000 (09:11 -0500)]
Merge branch 'bug_9646' into 3.12-master

8 years agoBug 9646 - Replace YUI button on the printers administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:43:16 +0000 (08:43 -0500)]
Bug 9646 - Replace YUI button on the printers administration page with Bootstrap

This patch converts the toolbar on the printers administration page to
Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the printers administration page and confirm that the "New
printer" button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works well. No errors.
Off-topic: How do you access this page? I can't find a link
(tested using .../cgi-bin/koha/admin/printers.pl)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works well, no problems found.
Accessed printers page manually: /cgi-bin/koha/admin/printers.pl
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9645' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:09:57 +0000 (09:09 -0500)]
Merge branch 'bug_9645' into 3.12-master

8 years agoBug 9645 - Replace YUI buttons on the quotes management page with Bootstrap
Owen Leonard [Fri, 1 Feb 2013 21:10:14 +0000 (16:10 -0500)]
Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap

This patch converts the toolbar include file used by the quotes editor
to Bootstrap, replacing YUI button and menu code with Bootstrap markup.

To test, view any page in the quotes editor. Buttons and menus should
look correct and work correctly. Test save, delete, and upload buttons
on the summary page, and save and delete buttons on the upload page.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: All buttons work. Tested add, delete and upload.
You are using icon-remove and not icon-remove-circle,
which I prefer but is different of Bug 9627.
Question: "Import quotes" takes you to "Quotes uploader",
would not it be more consistent to use "Upload quotes" or
"Quotes importer"?

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
I think the difference to 9627 is, that this really deletes
quotes, while the icon-remove-circle is used for closing subscriptions.
Closed subscriptions remain in the system, it's just a way to indicate
that there will be no new issues. There is a separate option to really
delete subscriptions.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9644' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:08:33 +0000 (09:08 -0500)]
Merge branch 'bug_9644' into 3.12-master

8 years agoBug 9644 - Replace YUI button on the suggestions management page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 20:28:19 +0000 (15:28 -0500)]
Bug 9644 - Replace YUI button on the suggestions management page with Bootstrap

This patch converts the toolbar on the suggestions page to to Bootstrap,
replacing YUI button code with Bootstrap markup.

To test, view the suggestions page and confirm that the "New purchase
suggestion" button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Another confirmation. Button looks and works. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
8 years agoMerge branch 'bug_9643' into 3.12-master
Jared Camins-Esakov [Mon, 18 Feb 2013 14:07:33 +0000 (09:07 -0500)]
Merge branch 'bug_9643' into 3.12-master

8 years agoBug 9643 - Replace YUI button on the road types administration page with Bootstrap
Owen Leonard [Sun, 3 Feb 2013 13:58:26 +0000 (08:58 -0500)]
Bug 9643 - Replace YUI button on the road types administration page with Bootstrap

This patch converts the toolbar on the road types administration
page to to Bootstrap, replacing YUI button code with Bootstrap markup.

To test, view the road types administration page and confirm that
the "New road type" button looks correct and works correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Confirmed, button works and looks correctly. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>