Commit graph

17986 commits

Author SHA1 Message Date
Fridolyn SOMERS
5c627db14f Bug 7253: followup : manage toolbar for fastcataloging
During fast cataloging, hide some toolbar menus of biblio edition page :
- Save and view record
- Z3950 Search
- Framework change
Also display "(fast cataloging)" in biblio and item editon.

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

Tested:
- adding a fast add with duplicate and without
- adding a new record, checked toolbar showed up correctly
- editing existing record, checked toolbar showed up correctly
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 10:00:37 -05:00
Fridolyn SOMERS
67af102586 Bug 7253: fast cataloging not always checking out
When using fast cataloguing to create a biblio and item on the fly, workflow looses datas when a duplicate is detected.
This comes from the use of a mix of circborrowernumber and borrowernumber in forms.

This patch corrects by using always circborrowernumber in fast cataloguing workflow.
Also adds html and uri escape for barecode where necessery.

Test plan :
With duplicate :
- Go to a borrower circulation page
- Enter a non existing barcode
- Enter a due date
- Click on "Check Out"
=> a message says the barcode was not found
- Click on "Fast cataloguing"
=> The biblio edition page appears with fast cataloguing framework
- Fill mandatory fields by using an existing ISBN
- Click on "Save"
=> a yes/no message says "Duplicate record suspected"
(Choosing yes will brake fast caloguing workflow, in this case librarian should create an item and checkout again)
- Click on "No"
=> The item edition page appears with barcode already filled
- Fill mandatory datas
- Click on "Add item"
=> Borrower circulation page appears again, check that item has been checked out with the specified due date

You may test without duplicate

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested following the plan and by fast cataloging a non-duplicate.
All works as expected.

Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 10:00:37 -05:00
Jared Camins-Esakov
7a14dca14f Merge branch 'bug_9471' into 3.12-master 2013-02-12 09:14:49 -05:00
a4d1fd124b Bug 9471 - Use DataTables on serials claims page
Replace the tablesorter plugin with the DataTables plugin on the
serials claims page.

This patch replaces some custom table fitlering code with code which
uses DataTables' built-in table fitlering. A minor correction to markup
has also been made to properly align inputs in the filter form.

To test, run the serials claims report for a vendor with data which will
populate results. Confirm that table sorting works correctly. Confirm
also that filtering by title and branch works.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works as advertised. I have compared side by side the both pages, with
tablesorter, and with DataTables. The both work. No regression. With
DataTables, no more sorting on Begin clam column, which is great. A new sort
option may be usefull on the Library column (wasn't the with tablesorter
neither).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 09:14:46 -05:00
Jared Camins-Esakov
e30b5861f3 Merge branch 'bug_9462' into 3.12-master 2013-02-12 09:05:15 -05:00
2cf41d31ff Bug 9462 [Revised] Use DataTables on patron detail page
Replace the tablesorter plugin with the DataTables plugin on the
patron detail page.

To test, open a patron detail page for a patron who has checkouts,
holds, and relatives' checkouts. Confirm that table sorting works
correctly for each of those three tables.

Revision adds some JavaScript designed to handle table-sizing for tables
which are hidden initally in tabs. DataTables has an approved method for
handling these cases:
http://www.datatables.net/examples/api/tabs_and_scrolling.html

This should prevent the table of existing holds from looking squeezed.

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>
2013-02-12 09:04:52 -05:00
Jared Camins-Esakov
aeaea10cf0 Merge branch 'bug_9469' into 3.12-master 2013-02-12 08:59:56 -05:00
3c0b1f6225 Bug 9469 - Use Datatables in serials statistics wizard
Replace the tablesorter plugin with the DataTables plugin on the
serials staitsics wizard report.

To test, run the serials statistics wizard (Reports -> Serials). Confirm
that table sorting works correctly.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works with DataTables as it used to work with tablesorter.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:59:43 -05:00
Jared Camins-Esakov
d350f6235c Merge branch 'bug_9440' into 3.12-master 2013-02-12 08:52:21 -05:00
d8c60a6e15 Bug 9440 - update Koha's LICENSE file from GPL2 to GPL3
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I'm not sure what the correct test plan for this is, but a diff
of LICENSE in Koha after applying the patch and the file at
http://www.gnu.org/licenses/gpl-3.0.txt shows no differences.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:52:10 -05:00
Jared Camins-Esakov
840a907b86 Merge branch 'bug_9105' into 3.12-master 2013-02-12 08:50:02 -05:00
d85fa9c5fb 9105: Followup for closing Zoom connections
Housekeeping: close the results sets and connections from Z3950 searches.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
No regression found, all tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:49:58 -05:00
Jared Camins-Esakov
2131c66edd Merge branch 'bug_9323' into 3.12-master 2013-02-12 08:45:39 -05:00
33c4c574f3 Bug 9323 [Counter-proposal] Untranslatable string in serials search
The translator seems to have a problem with the _() function inside
HTML. Rather than move only the translatable string to the <script>
block, why not move all of the JavaScript to the <script> tag? This
keeps things a little more organized and lets us follow the guideline to
always use double quotes with _().

Same test plan as Jonathan's patch:

- translate update LANG
- Check in your po file that the string "Are you sure you want to
  reopen this subscription?" does not exist.
- Apply the patch
- translate update LANG
- Check in your po file that the string is translatable

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String is now translatable.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:44:54 -05:00
Jared Camins-Esakov
9d909dd8ff Merge branch 'bug_9583' into 3.12-master 2013-02-12 08:40:58 -05:00
68f4801865 Bug 9583 - OPAC cart button display problem in Chromium
Legacy markup in the script which generates the OPAC's Cart button
causes display problems in Chrome under the new HTML5 doctype.

This patch removes the extra markup, which has been unnecessary since
we changed the way the Cart and Lists buttons are displayed in Bug
7584.

To test, view the OPAC in several browsers, including a Chromium-based
browser (Specifically Chromium-based. It is not a WebKit-related bug).
The Cart button should display correctly with and without items in the
cart.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Works great, back to normal.
Tested in windows (chrome, firefox, opera) and linux (chrome, chromium)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with Chromium and Firefox in Ubuntu. No regression found and
display is correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-12 08:40:53 -05:00
Jared Camins-Esakov
f081ac91b2 Merge branch 'bug_9222' into 3.12-master 2013-02-10 13:16:03 -05:00
Fridolyn SOMERS
4a5795e320 Bug 9222: manual history reversed in subscription-detail.pl
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>
2013-02-10 13:15:43 -05:00
Jared Camins-Esakov
d38120cc27 Merge branch 'bug_9380' into 3.12-master 2013-02-10 10:18:32 -05:00
9d4896eace Bug 9380 - branch not recording right on writeoff
Test Plan:
1) Write off fines as various branches
2) Observe the stats lines include the wrong branchcode
3) Apply patch
4) Repeate step 1
5) Observe the stats lines include the correct branchcode

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

Also tested by changing branch and writing off again - all
tests pass.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked individual and complete write off for different branches.
Write offs were always recorded correctly for the logged in branch.
All tests and QA script pas.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-10 10:11:48 -05:00
Jared Camins-Esakov
d0b2c0d770 Merge branch 'bug_9392' into 3.12-master 2013-02-08 21:39:08 -05:00
Fridolyn SOMERS
755decfd89 Bug 9392: confirmation does not appear for negative notforloan items issues
When checking-out an item marked "not for loan" with a positive value,
you get a message to forbid or confirm issue (depending on
AllowNotForLoanOverride syspref).  For an item with a negative value
(usually during acquisition process), the issue is made without forbid
or confirm message.

This patch simply changes the test notforloan > 0 into notforloan != 0.

Test plan :
- Checkout an item with items.notforloan = 0
=> The item is issued without message
- Checkout an item with items.notforloan > 0
=> A message forbids or asks confirmation to override
- Checkout an item with items.notforloan < 0 (e.g., on order)
=> A message forbids or asks confirmation to override

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked with AllowNotForLoanOverride on and off.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 21:38:49 -05:00
Jared Camins-Esakov
f481d9259d Merge branch 'bug_9283' into 3.12-master 2013-02-08 09:48:37 -05:00
d68b8357d7 Bug 9283 - Change structure of export checkouts form
This patch changes the structure of the export checkouts form
so that it is a little more linear. This change moves generation of the
export options from JavaScript to the markup, eliminating an instance
of dependence on YUI menus.

To test, enable checkout exports by specifying a value for
ExportWithCsvProfile or  ExportRemoveFields. Load a patron with
checkouts in circulation. Try the various checkout export options. Each
should function correctly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:48:10 -05:00
Jared Camins-Esakov
f66162592e Merge branch 'bug_9417' into 3.12-master 2013-02-08 09:35:01 -05:00
0131b9e697 Bug 9417 - Allow number of results per page to be selectable for guided reports
This patch adds the ability to select the number of row to show per page while
retaining the default rows per page as 20.

Test Plan:
1) Apply patch
2) Run a guided report that will have many resultant rows
3) Try the various rows per page options
4) Verify the rows per page selected is retained when paging through results

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>
2013-02-08 09:34:54 -05:00
Jared Camins-Esakov
4da872e51f Merge branch 'bug_9332' into 3.12-master 2013-02-08 09:23:53 -05:00
Adrien Saurat
8bae2c9916 Bug 9332: Display call number in "Holds waiting" notice
When checking out from a patron page, a notice "Holds waiting" appears
if a biblio (on hold) is waiting for this borrower.
This patch adds the call number information to this warning.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Nice little improvement, thanks.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:23:51 -05:00
Jared Camins-Esakov
ea17f17a0a Merge branch 'bug_9329' into 3.12-master 2013-02-08 09:07:45 -05:00
Adrien Saurat
0dca3e58a7 Bug 9329: Wrong message for already expired cards
Previously users would see the same message whether their card was about
to expire or was already expired. This patch adds a new message to
handle cards which are about to expire, following the
NotifyBorrowerDeparture system preference.

TEST PLAN :

The best way to test would to have at the same time :
- a SQL client to change the expiry date of a borrower
- an OPAC session opened for the same patron.

Case 1: expiry date is set in the future
-> no warning

Case 2: expiry date is set in the near future (within the
"NotifyBorrowerDeparture" system preference range)
-> a warning says the card will expire on **date**

Case 3: expiry date is set in the past
-> before patch, same warning as Case 2
-> after patch, new warning indicating that the card has expired

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Added description to the patch and copied test plan from the bug report.
Patch passes test plan.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:07:21 -05:00
Jared Camins-Esakov
606279b5f1 Merge branch 'bug_9320' into 3.12-master 2013-02-08 09:02:57 -05:00
Sophie Meynieux
a0b885c98c Bug 9320 Pending reserves report should not show waiting items
Test plan : * chose an item reserved by multiple patrons.
                * return the item and confirm reservation =>
                  item is waiting to be picked up
                * run circ/pendingreserves.pl
                    => without patch, this item is shown in the list
                    => with the patch, only really available items are show.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Works according to test plan. The title with one waiting item appeared
in pending holds report before the patch, doesn't appear after the
patch.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-08 09:02:53 -05:00
Jared Camins-Esakov
180a4d83b9 Merge branch 'bug_9451' into 3.12-master 2013-02-08 08:42:35 -05:00
Jared Camins-Esakov
651e8a3fad Bug 9451: Quiet warnings and Plackify borrower_stats.pl
There are several warnings and one non-Plack-compatible variable in
reports/borrower_stats.pl.

To test:
1) Apply patch
2) Use the borrower report wizard to create a report that includes an
   extended patron attribute.
3) Check the logs, and make sure that you don't see any of the
   following messages:
   Variable "$period" is not available at
     /home/jcamins/kohaclone/reports/borrowers_stats.pl line 265.
   Use of uninitialized value in hash element at
     /home/jcamins/kohaclone/reports/borrowers_stats.pl line 375.
   Use of uninitialized value in hash element at
     /home/jcamins/kohaclone/reports/borrowers_stats.pl line 376.

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>
2013-02-08 08:42:32 -05:00
Jared Camins-Esakov
41679ca080 Merge branch 'bug_9499' into 3.12-master 2013-02-07 19:44:56 -05:00
Liz Rea
f455f0b1ab Bug 9499 - --itemscontent= option is undocumented in advanced-notice.pl cronjob + default date should be date_due, not issuedate
To Test:

Set up a borrower to receive due and/or predue notices.
Define your predue and/or due notice to use <<items.content>>
Give your borrower an issue that will trigger a notice to be sent
(Example: Henry Acevedo has checked out a book that will be coming due tomorrow,
he wants to receive predue notices 1 day in advance)

On the command line, run (your paths may vary, these are mine):
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl -c -n

Note that the date listed is the due date, not the issue date.

Then run:
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl -c -n --itemscontent=issuedate,title,author,barcode

Note that the date listed is the issue date, not the date due.

Also run
sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl --help

Should show the help.

sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl --man

Should show the man page version of the help.

sudo env KOHA_CONF=/etc/koha/sites/devlibrary/koha-conf.xml PERL5LIB=/usr/share/koha/lib perl advance_notices.pl

Should show the help. This script requires confirmation before running (-c or nothing is done).

Note that the documentation refers to the --itemscontent= option and now allows --man as well as --help. Also it is a proper POD.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Works as advertised according to the fine test plan.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:44:50 -05:00
Jared Camins-Esakov
e2b57c1d6d Merge branch 'bug_9034' into 3.12-master 2013-02-07 19:36:24 -05:00
Julian Maurice
47cf483f57 Bug 9034: Filters are disabled by default
A small link above the table allow to enable this feature.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Replace single quote strings with double quote strings
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:36:15 -05:00
715826b799 Bug 9034 [Follow-up] Add sorting and filtering on items table (catalogue/detail.pl)
This follow-up to the original patch offers an alternative method
to handle the width of the table and form fields:

- Reduce the font size of the filter input fields
- Make the filter inputs' width 100% instead of fixed
- Add "'bAutoWidth': false" to the datatables initialization
  to prevent the table width from being set to the browser window
  width on load. This allows the browser to be re-sized and have
  the table re-flow with it.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:35:51 -05:00
Julian Maurice
3e69121299 Bug 9034: Add CSS rule to reduce width of items table
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>
2013-02-07 19:35:51 -05:00
Julian Maurice
74d11c4b80 Bug 9034: Add sorting and filtering on items table (catalogue/detail.pl)
This patch introduces a new javascript plugin for dataTables
(columnFilter).

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>
2013-02-07 19:35:51 -05:00
Jared Camins-Esakov
4b2442d3bd Merge branch 'bug_9143' into 3.12-master 2013-02-07 19:31:06 -05:00
Robin Sheat
4d373f6c44 Bug 9143 - changelog and build script updates
This accounts for the 3.10 release, and the 3.11 development branch

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-07 19:30:51 -05:00
Jared Camins-Esakov
d622fde3a0 Merge branch 'bug_9493' into 3.12-master 2013-02-07 19:25:59 -05:00
Fridolyn SOMERS
9c04330449 Bug 9493: confirmations for user holds in opac are not translatable
In opac-user.tt, javascript for user holds confirmations (cancel, suspend, resume) are not translatable.
This is because text is in onclick attribute, withtout javascript method for translatable strings : _().

This patch moves those strings as variables into script tag and sets them translatable.

Test plan :
- set a hold for a user
- Go to OPAC user page "my summary"
- click on "Cancel"
=> you get a confirmation message
- click on "Suspend all holds"
=> you get a confirmation message
- click on "Resume all suspended holds"
=> you get a confirmation message
Test this is 'en' and another language.

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>
2013-02-07 19:25:53 -05:00
Jared Camins-Esakov
723dadcf7a Merge branch 'bug_9556' into 3.12-master 2013-02-07 08:37:25 -05:00
Galen Charlton
9912e38404 Bug 9556: fix setting messaging prefs when changing patron category
As a result of accumulated changes to field names returned
by the members/default_messageprefs.pl service, the JavaScript
to change the patron messaging preferences to the category default
when changing a patron's category in the patron editor stopped
working.

To test:

[1] Turn on the EnhancedMessagingPreferences feature.
[2] Set message preference defaults for at least two
    patron categories.
[3] Before applying the patch, create a new patron record
    using one of the categories you set prefs for, then
    change the category, then change it back again.  You
    will see that numeric settings like the number of days
    for advanced notices will change, but checkboxes won't change.
[4] Apply the patch, then create a new patron record and
    try changing the patron category.  You will see that all of
    the preferences will get updated to the category default
    each time you change the category.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
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>
2013-02-07 08:37:17 -05:00
Jared Camins-Esakov
375873d221 Merge branch 'bug_9473' into 3.12-master 2013-02-07 07:48:24 -05:00
a63960acc7 Bug 9473: Use DataTables on tags list page
Replace the tablesorter plugin with the DataTables plugin on the tags
list page.

To test, got to tags moderation and click on a term which tags
multiple titles. On the tags list page, confirm that table sorting works
correctly.

Revision makes default result count (20) match options for number of
pagination entries (10,20,50,100,all).

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>
2013-02-07 07:48:05 -05:00
Jared Camins-Esakov
faea0a52cc Merge branch 'bug_9476' into 3.12-master 2013-02-07 07:39:52 -05:00