Commit graph

9186 commits

Author SHA1 Message Date
Jonathan Druart
8ca8d182f3 Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice - bootstrap
Same test plan as previous patch but with the bootstrap theme set.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-26 00:57:20 +00:00
Jonathan Druart
c8f38bfb3d Bug 7825: Changed OPACItemHolds syspref to be no|yes|force choice
Currently, the Koha system preference OPACItemHolds allows a library
system to choose to allow patrons to place bib and item level holds from
the OPAC, or to allow patrons only to place bib level holds only from
the OPAC.

This patch set adds a third option, "force", which *requires* that
patrons place item level holds from the opac, with no option of making a
bib level hold.

This patch modifies the system preference OPACItemHolds to be of the
type "Choice", with the choices being "no", "yes", "force". The patch
does not alter the currently set value of OPACItemHolds for database
updates, only adding the additional option.

Test Plan:
1) Set OPACItemHolds to "no". Check that OPAC holds behave as it is now
(no "Place On" column, no "Select a specific copy" table, making a
reserve is successful)
2) Set OPACItemHolds to "yes". Check that OPAC holds behave as it is now
( "Place On" column is there, "Select a specific copy" table shows when
"A specific copy" is selected, making a reserve is successful)
3) Set OPACItemHolds to "force". Check that OPAC holds behave as follows:
  -  no "Place On" column is present
  -  "Select a specific copy" table is opened
  -  making a reserve is successful

This patch is a squashed patch of the 3 following patches:

Amended opac-reserve.tt accordingly

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>

Bug 7825: Followup prevent submission without choosing an item

+ Fix some ergonomic issues in opac-reserve

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>

Bug 7825: Updatedatabase should only change the type and options values.

The value field should not be changed. We have to keep '1' for 'yes' and ''
for 'no'.

Original patch is from Srdjan Jankovic.

Signed-off-by: Koha team AMU <koha.aixmarseille@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Testing notes on 4th patch.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-26 00:55:49 +00:00
Jonathan Druart
059107ca75 Bug 3050: QA follow-up
1/ Use the usual way for ordering dates in table
2/ Add a confirmation dialog box on deleting a file
3/ Add some UTs

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 21:15:03 +00:00
Jacek Ablewicz
9c38ed77d5 Bug 3050 - Add an option to upload scanned invoices #3/3
(part #3: DB updates + new syspref)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 21:14:53 +00:00
Jacek Ablewicz
35d323ae72 Bug 3050 - Add an option to upload scanned invoices #2/3
(part #2: changes to existing acqui scripts & templates)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 21:14:42 +00:00
Jacek Ablewicz
480847e81c Bug 3050 - Add an option to upload scanned invoices #1/3
(part #1: new module w/ UT + script + template)

New feature, adds an ability to attach arbitrary files to
acquisition records (currently: to the invoices - but it can
be extended to baskets, basketgroups, budgets etc.).

Note: this code is (heavily) based on "Bug 8130 - attach PDF
files to a patron record" by Kale M Hall, main difference being
that new table (misc_files) and new module (Koha/Misc/Files.pm)
are intended to be a little more generic solution - they allow to
store and manage files associated with great many kinds of records,
from arbitrary tables.

Test plan:
1) Apply patch[es]
2) Run installer/data/mysql/updatedatabase.pl
3) Enable system preference 'AcqEnableFiles' in acquisition
4) New option 'Manage invoice files' appears in the invoice
detail page
5) Upload/view/download/delete some files for some invoices
6) Try to delete invoice with files attached (files should
get deleted as well)
7) Try to merge 2+ invoices with files attached; after merge,
all files previously attached to individual invoices being
merged should be attached to resulting invoice (merge destination)
8) prove t/db_dependent/Koha_Misc_Files.t
9) Ensure there are no regressions of any kind in invoice detail
page (acqui/invoice.pl).

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 21:14:00 +00:00
Mathieu Saby
2dab2cc223 Bug 12110: Display the order vendor note in basket and basketgroup CSV and PDF
This bug adds the "vendor note" for each order in the PDF for
basketgroups.  The note is displayed only if it exists, just under the
bibliographic information.

I added a separation line "--------" between bibliographic information
and the note, so that it could be visible at 1st glance.

It also replaces the internal note with the vendor in the CSV for basket
and basketgroup.  It is more logical and useful for libraries to export
the note made for vendor, as those files are destined to be sent to the
vendor.

Test plan :
- fill a basket with some orders, some with internal notes, some with
  vendor notes
- export the basket in CSV : only the vendor notes should be present
- put the basket in a basketgroup
- export the basketgroup in CSV : only the vendor notes should be
  present
- Select "English-2 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
  the bibliographic information
- Select "English-3 pages" template for basketgroups in Sysprefs
- export the basket in PDF : the vendor notes should be present under
  the bibliographic information

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 15:21:22 +00:00
27f1df0670 Bug 9088: if there is only one active order, pre-select it when creating new orderings
This patch makes the following changes to the template:

[1] If you add an order line, and you have one active fund (and zero or
    more inactive funds), the only active fund is preselected.
[2] If you modify an order line while its fund is inactive, it now shows
    the label (inactive) behind the fund name. (Note that other inactive funds
    may come up when clicking 'Show all' as they did before.)
[3] Corrected some indentation in this template part.

Test plan:

[1] Add an order line while having one active fund. Is it selected?
[2] Add an order line while having two or more active funds. No fund
    should be preselected.
[3] Modify an order line with an active fund. Is it still selected?
[4] Modify an order line with an inactive fund F2 (while having one active
    fund F1; note that this test explicitly wants F1 to be before F2).
    Check if F2 is selected and is labeled inactive.
[5] (Bonus points:) Modify an order line that refers to a deleted fund.
    If you edit this order, the fund combo should say: Select a fund.
    (Note: if you delete a fund, the budget_id in aqorders remains.)

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
I test against master 3.15.00.051
I test against all the three options of the AcqCreateItem:
placing an order
receiving an order
cataloging the record
All is OK.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-25 15:07:49 +00:00
Galen Charlton
96b60b5140 Bug 12238: (follow-up) tweak descriptions of the ID list
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 15:53:21 +00:00
Stéphane Delaune
03f420e6f5 Bug 12238: Add option to supply list of record IDs to MARC export tool
The MARC export tool now includes the option to specify a file
containing record IDs to export.  When run on the command line,
this is specified using the --id_list_file switch.

Note that the list of IDs acts as a filter on other criteria
for selecting records to import.  For example, if you export
all bibs belong to a given library and also specify an ID file,
the bibs must both belong to the library and be in the ID file.

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

Tested writing txt file with biblionumbers, loading in tools and exporting

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 15:46:34 +00:00
Galen Charlton
8a32843ebf Bug 11392: (follow-up) fix syntax error in template
In the two FOREACH loops introduced by the patch, wrap
the module and action names with quotes.  This fixes a
problem where parsing the template crashes with the following
error:

  Template process failed: file error - parse error - .../viewlog.tt line 83: unexpected token (RETURN)
    [% FOREACH actx IN [ ADD DELETE MODIFY ISSUE RETURN CREATE ] %] at .../C4/Templates.pm line 132.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 15:09:23 +00:00
Pasi Kallinen
47f7cc8900 Bug 11392: Allow translating the viewlog module and action names
When viewing the logs, the user can see module and action,
such as "SYSTEMPREFERENCE", "MEMBERS" or "CREATE", "MODIFY", etc.
These texts are not translatable.

This patch allows translating those. It also adds the missing "CREATE"
action to the pulldown.

To test:

1) Go browse the system logs. Note the contents of the "Action" and
"Module" -pulldowns, and the contents of those columns in the log table.
2) Apply patch
3) Go browse the system logs again. The pull-downs should work, and
show the same values as before (plus "Create" for Action), and the
Action and Module -columns in the log table should not be in ALL CAPS.
4) cd misc/translator
5) perl translate update xx-YY
6) Check that the po/xx-YY-i-staff-t-prog-v-3006000.po contains the
values for the pull-downs in it. (Look for eg. "System prefs")

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 14:55:25 +00:00
Galen Charlton
41def6af1d Bug 11365: (follow-up) trim whitespace in the translate_card_element block
Trim leading and trailing whitespace in the text generated
by the translate_card_element block to avoid generating
unescaped multi-line strings, which breaks the JavaScript

To test:

[1] Test actions in the patron card creator that generate
    JavaScript alerts, such as hitting the delete button
    without first selecting a batch or profile.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 14:46:54 +00:00
Pasi Kallinen
b712a45deb Bug 11365: make label card element title texts translatable
To test:

1) cd misc/translator
2) perl translate update xx-YY
3) check that there's no msgid that contains the patron card label
   element title texts in po/xx-YY-i-staff-t-prog-v-3006000.po
4) apply patch
5) perl translate update xx-YY
6) check po/xx-YY-i-staff-t-prog-v-3006000.po that it contains the
   msgid. (search for "BLOCK translate_card_element")

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described. Tested updating po file, translating and installing
language, checked on tools page.
No errors

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 14:33:13 +00:00
Jonathan Druart
eedaec6e45 Bug 12165: (follow-up) display record title
The code introduced by bug 2546 uses an undefined variable (line.title).
It should be ACCOUNT_LINE.title.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 13:46:08 +00:00
Katrin Fischer
19d8f790d7 Bug 12165: Add descriptions of charges (bug 2546) to Bootstrap Opac theme
1) Create an account with lots of different charges, fines, fees, etc.
2) Look at the accounts tab in the prog OPAC theme
3) Compare the page to bootstrap theme
4) Verify display is now the same

In my tests I found some things that could still be improved,
but for the goal is to make all OPAC themes behave the same.

Signed-off-by: Marc Véron <veron@veron.ch>

Tested by changing accounttype in table accountlines to all possible
values like Pay, Pay00, Pay01 etc.  Both themes display the same values,
e.g. "Payment, thanks (cash via SIP2)" for Pay00

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 13:45:09 +00:00
da3939ba70 Bug 12147: Convert action links on invoices pages to a menu
Prior to this patch, the column for displaying the action links
was too narrow, leading to an ugly display.  This patch groups
"action" links into a menu as was done with Bug 11763.

This patch also converts the date column sorting configuration to use
header class instead of an index.

This patch also corrects a couple of HTML markup errors: An
improperly-closed <input> and an improperly closed <option>.

To test, view the invoices page and confirm that the "Actions" menu
button works corectly. Test the functionality of each menu options:
Details, Close, Reopen, and Delete. Confirm that sorting by billing date
still works correctly.

Much nicer user interface. Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 13:35:42 +00:00
ad6d367763 Bug 10330 - Rename system preference authoritysep to AuthoritySeperator
Test Plan:
1) Apply patch
2) Run updatedatabase.pl
3) View some records with authorities
4) Note your previously set authority separator should still be in use

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 13:26:48 +00:00
Galen Charlton
3de4948bda Bug 12190: fold the "Creators" system preference tab into "Tools"
The "Creators" tab in the system preferences editor had only one
preference.  In order to consolidate the display as well as to
address the issue that "creators" doesn't have much of a connection
to "patron cards", the ImageLimit system preference is moved to
the Tools tab by this patch.

To test:

[1] Verify that the ImageLimit preference now shows up in the
    Tools tab in the system preference editor (along with an
    existing Tools preference, MaxItemsForBatch.
[2] Verify that the sysprefs editor no longer has a "Creators"
    tab.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-23 13:09:51 +00:00
Marc Véron
82791bfecd Bug 10936: (prog theme) remove duplicate 'Standard number' option in Advanced search
TEST PLAN
---------
1) Set opacthemes system preference to prog
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
   -- it's not this time

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Work as described on prog theme, no more duplicate.
No koha-qa errors

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-22 21:46:18 +00:00
Jesse Maseto
8cf9be4f10 Bug 10936: remove duplicate 'Standard number' option in Advanced search
This patch removes the duplicate 'Standard number' option
under the more options of the OPAC advanced search correctly
following updates from Katrin.

TEST PLAN
---------
1) Set opacthemes system preference to bootstrap
2) In OPAC, click 'Advanced search'
3) Click 'More options'
4) Check the Keywords dropdown for duplicate 'Standard number'
5) Apply patch
6) Refresh page, and make sure 'More options' is clicked still
7) Check the Keywords dropdown for duplicate 'Standard number'
   -- it's not this time.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-22 21:45:19 +00:00
68fd61fe9f Bug 12211: fix wrong home link in bootstrap public catalog login page
In bootstrap opac-auth.tt, the link to "Home" in breadcrumbs leads
to #, it should lead to opac-main.pl like in all other pages.

Test plan :
 - Use boostrap opac theme
 - Go to cgi-bin/koha/opac-user.pl when not logged
=> without patch, clicking on Home does not change the page
=> with patch, clicking on Home leads to opac-main.pl

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Link ok, no errors.

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

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-22 21:12:40 +00:00
ef00aeb33a Bug 12106: fix capitalization: "Patron Attributes" on tools/patron import
There are three instances of incorrectly-capitalized "Patron Attributes"
on the patron import page. This patch corrects them.

To test, view the patron import page (Tools -> Import patrons). Confirm
that instances of the phrase "patron attributes" in the bottom-most
fieldset are correctly capitalized.

Followed test plan, works
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-22 21:10:28 +00:00
Galen Charlton
3046d719f1 Bug 12184: fix typo "retricted" on checkin page
To test:

[1] Check an item that belongs to a restricted patron and
    specify a non-default return date.
[2] Verify that the warning message contains "restricted"
    rather than "retricted".

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Patch applies and makes sense. (I have not checked the actual UI,
but that should not be necessary for such a simple typo correction.)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-22 21:09:49 +00:00
Bernardo Gonzalez Kriegel
a23c452b33 Bug 12244 - followup to fix tabs
Only tab removing

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:59:09 +00:00
Nicole C. Engard
f0bc18951c Bug 12244 - Update Acq Help for 3.16
This updates the basket help.

To test:

* Open a basket
* Click help and confirm it's right and there

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

Final comment: koha-qa complains about tabs, removed in followup

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:58:39 +00:00
Nicole C. Engard
a990de106d Bug 12244 - Update Admin Help for 3.16
This patch updates 3 help files.

To test:

* Visit Administration > Patron Categories
* Click help
* Confirm it's there and right
* Visit Administration > Currencies
* Click help
* Confirm it's there and right
* Visit Administration > Circ Rules
* Click help
* Confirm it's there and right

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

Help ok. One comment: on circ rules, I think that "you're" can
be correct, but I prefer "you are"

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:58:16 +00:00
Nicole C. Engard
16196fc62c Bug 12244 - Update authorized values help for 3.16
This patch adds a few new values to the authorized values help

To test:

* Visit Administration > Authorized Values
* Click help
* Confirm help is there and correct

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:57:32 +00:00
Nicole C. Engard
5889f893cb Bug 12244 - Update Notices Help Files
Updates the 2 notices help files with new info.

To test:

* Visit Tools > Notices & Slips
* Click help and confirm it's there and right
* Visit Tools > Overdue notices/status triggers
* Click help and confirm it's there and right

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:57:01 +00:00
Nicole C. Engard
c08e215a55 Bug 12244 - Update Search Help for 3.16
This patch updates the search help file.

To test:

* Visit Search
* Click help
* Confirm help is there and correct

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:56:13 +00:00
Nicole C. Engard
ee1f77441e Bug 12244 - Update cataloging help for 3.16
This patch adds a bit to the addbiblio help file.

To test:

* Go to Cataloging
* Click add new
* Click help
* Confirm help is there and correct

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

Help is ok

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:55:48 +00:00
Nicole C. Engard
1aaa9fe535 Bug 12244 - Update Patron help files for 3.16
This updates the patron help file and adds a missing help file.

To test:

* Go to a patron record
* Click help and confirm text is correct
* Go to patron's purchase suggestions
* Click help and confirm that help file is there and correct

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Both text are correct, link still points to 3.14 manual, but depends
on a value that must change with new release.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:55:08 +00:00
Nicole C. Engard
d087cd9337 Bug 12244 - Koha 3.16 Circ Help Updates
This patch updates the check in help (the only change for 3.16).

To test:
* Visit Circulation > Check in
* Click Help
* Confirm that help text is right

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

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:54:19 +00:00
Galen Charlton
bafeb881c9 Bug 12271: (follow-up) fix minor errors in Bootstrap theme
To test:

[1] Verify that prove -v xt/author/valid-templates.t passes.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-19 16:25:53 +00:00
Galen Charlton
8f22386527 Bug 12206: fix HTML in other holdings list in staff search results page
To test:

[1] View, in the staff interface, a record with alternate holdings
    (as controlled by the AlternateHoldingsField system preference).
[2] Verify that the HTML list is closed correctly.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-13 14:07:12 +00:00
e7bf50600d Bug 9724: ensure hourly loans show time due in SCO
Due dates in the self checkout module don't display the time items are
due, and thus items which are on hourly loans don't display an accurate
due date and time. This patch corrects this by adding the "as_due_date
=> 1" parameter added by Bug 9723.

To test, apply the patch for Bug 9723 if necessary. Enable an hourly
loan period for an itemtype in your collection. Log into the
self-checkout system and check out an item which circulates by the hour.
The due date and time should be displayed correctly.

Check out an item which does not circulate hourly. The due date should
be displayed as a date only.

Test in both prog and Bootstrap themes.

Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-12 14:30:55 +00:00
31781ffb02 Bug 12214: (follow-up) Clean up reports-toolbar.inc, show Edit link when SQL has errors
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-09 14:40:15 +00:00
Jonathan Druart
4e7e8a5544 Bug 11975: improve the batch patron deletion code
This patch tries to improve the code for the cleanborrowers.pl tool.

- use KohaDates plugin and Koha::DateUtils for date management,
  removing a dependency on C4::Dates
- replace variables step1, step2 and step3 with step
- add a JavaScript check if no action if checked

Test plan:
- Backup your DB
- Play with the Patron deletion/anonymisation tool and try to find
  something inconsistent.
If you don't find something different, it works!

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-09 14:32:21 +00:00
6f0215da9e Bug 9723: display time due for hourly loans in the public catalog
Due dates in the OPAC don't display the time items are due, and thus
items which are on hourly loans don't display an accurate due date and
time. This patch corrects this by adding (and using) a new "as_due_date"
option to the KohaDates plugin made possible by Bug 11148.

Thanks to Galen for providing the changes to KohaDates.pm.

To test, enable an hourly loan period for an itemtype in your
collection. View the display of date due on the following pages:

- Patron details (opac-user.pl) - Log into the OPAC as a user who has
  something checked out which circulates by the hour.

- Bibliographic details (opac-detail.pl) - View the details for an item
  which is circulates by the hour and is checked out.

- Course reserves details (opac-course-details.pl) - View the contents
  of a course reserve, one of which should be an item which circulates
  by the hour and is checked out.

Due dates for hourly items should show both date and time and be
formatted correctly. Due dates for non-hourly loans should show only the
date. Test in both prog and Bootstrap themes.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-08 16:38:43 +00:00
0b06e4ee18 Bug 12195 - Remove duplicated plugin jquery.dataTables.min.js
All templates in the staff client now load the DataTables jquery plugin
through a single include file, datatables.inc, which points to a copy of
the plugin in intranet-tmpl/lib/jquery/plugins. This patch removes the
unused copy of the plugin found in intranet-tmpl/prog/en/lib/jquery/plugins.

To test, search the Koha source for references to
jquery.dataTables.min.js. There should be no files which point to the
redundant file.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-08 16:18:05 +00:00
c2dae3288b Bug 12196 - Remove unused jquery.qtip.js plugin
The qTip jQuery plugin is not longer used anywhere in Koha. This patch
removes it.

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

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-08 16:17:34 +00:00
Robin Sheat
646d2aa325 Bug 12163 - fix adding new quotes
Something changed somewhere (maybe a new jQuery or datatables version)
and the javascript that redrew the table row after a new quote was saved
stopped working. This fixes the call to the datatables function so that
it matches the API.

Note that although the new quote didn't appear to be added, reloading
the page shows that it had been.

To test:
* Go and add a quote.
* Note that when you press enter after finishing the quote, the line
  stops being an editor, and becomes just a display, like it should.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-06 16:03:23 +00:00
Matthias Meusburger
acd0a91b11 Bug 12161: fix regression on serials receiving
Serial receiving was broken when "create an item record when receiving
this serial" is used for the subscription.  This bug was introduced by
the patch for bug 12138.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-06 14:43:38 +00:00
Jonathan Druart
51a4a5099f Bug 9063: rename num_biblios to num_records in addorderiso2709.{pl,tt}
Bug 2060 renames columns num_biblios with num_records in the
import_batches table.  The addorderiso2709 files had not been fixed.

Test plan:
Add an order from a staged file to a basket and verify the "# Bibs"
columns is correctly filled. Before the patch, the column was empty.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-06 14:36:19 +00:00
Magnus Enger
694ad0f8cc Bug 12185 - Remove extra "f" from parcel.tt
There is a typoed "f" outside of the HTML on line 279 of
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
This patch removes that extra "f".

To test:
It should be sufficient to look at line 279 before and after the
patch has been applied.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-06 14:34:16 +00:00
Jonathan Druart
fc1f90abc1 Bug 10857: (follow-up) update Bootstrap theme
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-05 21:43:47 +00:00
Julian Maurice
6a9323ab34 Bug 10857: (follow-up) encode 'limit' parameter values
to allow facets with '&' character.

Signed-off-by: sonia bouis <sonia.bouis@univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-05 21:43:33 +00:00
Jonathan Druart
6dd221223f Bug 10857: add ability to remove active facets when refining search results
When searching (at the OPAC or pro), facets can be enabled but never
disabled. So a user is obliged to relaunch the search.

This patch adds a new link "[x]" at the right of each selected facet.
This link relaunch the search without this facet.

Test plan:
- Launch a search (OPAC and pro)
- Enable some facets
- Disable some facets

Signed-off-by: sonia bouis <sonia.bouis@univ-lyon3.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patches pass all tests and QA script. Nice feature!

Tested in Boostrap and Prog, adding end removing multiple
facets in different sequences, adding and removing the
availability limit.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-05 21:42:59 +00:00
Galen Charlton
036f2a50e1 Bug 10500: (follow-up) disable AggressiveMatchOnISBN if UseQueryParser is on
The original patch did not correctly construction ISBN phrase
searches when QP is on.  Unfortunately, when attempting to fix that,
I discovered that there's a deep bug in QP that makes it generate
incorrect search queries when combining more than two atoms
in with the || operator.  Consequently, until that can be fixed,
this patch ensures that if UseQueryParser is on, AggressiveMatchOnISBN
has no effect.

To state it anther way, AggressiveMatchOnISBN works only when QP
is not in use.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-05 19:31:00 +00:00
ed4b60fa1d Bug 10500: Improve ISBN matching when importing records
Test Plan:
1) Catalog a record with the ISBN "0394502884 (Random House)"
2) Export the record, edit it so the ISBN is now
   "0394502884 (UnRandomHouse)"
3) Using the record import tool, import this record with matching
   on ISBN.
4) You should not find a match
5) Apply this patch
6) Run updatedatabase.pl
7) Enable the new system preference AggressiveMatchOnISBN
8) Repeat step 3
9) The tool should now find a match

Signed-off-by: Tom McMurdo <thomas.mcmurdo@state.vp.us>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-05-05 18:04:55 +00:00