Commit Graph

29807 Commits

Author SHA1 Message Date
Jonathan Druart e89ee57263 Bug 20148: Prevent adding same user multiple times to an order
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 802c81ce1a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-27 10:51:03 +02:00
Pasi Kallinen cdce1d8f39 Bug 20148: Prevent adding same user multiple times to acq basket
When adding a user to manage acquisitions basket, it is possible
to add the same user multiple times. Prevent that.

Test plan:

1) Go to Home -> Acquisitions -> [bookseller] -> [basket]
2) On the "Add user" in the Managed by-part, and try adding
   the same user multiple times.
3) Apply patch
4) Repeat 1 and 2. You should now get an error message saying
   the user is already in the list.

Signed-off-by: Pasi Kallinen <pasi.kallinen@joensuu.fi>
Signed-off-by: Roch D'Amour <roch.damour@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 757c9b4231)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-27 10:50:57 +02:00
Marcel de Rooy ac54d831df Bug 19452: [17.05.x] Remove the truncate option
The truncate option is not really useful. Its result is probably not what
most users of this script expect or need.
It truncates both tables borrower_message_preferences and
borrower_message_transport_preferences. This (unfortunately) includes
deleting messaging preferences for patron categories. After that, adding
preferences again will not add categories again, but only borrower
preferences which are all disabled.

Furthermore, we do not need to disable the foreign key check. Neither
do we actually need to truncate, deleting records seems sufficient.
Also deleting transport preferences is not needed, since it will be
done by a cascade from messaging preferences. Note that the subsequent
call of SetMessagingPreferencesFromDefaults will already delete the
records.

This makes it possible to remove the truncate option altogether.

Test plan:
[1] Select a patron category (say ST) and change days_in_advance to x.
[2] Select a ST patron and set days_advance to y in his msg prefs.
[3] Run borrowers-force-messaging-defaults.pl -doit
[4] Verify that the patron has been reset to the default prefs (incl.
    value x in days_in_advance).
[5] Verify that the patron category prefs are still intact.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-27 10:48:37 +02:00
Jonathan Druart da33f365de Bug 20145: Do not insert 0000-00-00 in patron tests (and more)
We should call Koha::Patron->is_expired in CanBookBeIssued instead of
doing the same calculation.

Tests have been adapted to pass with new SQL modes.

We should not need to update the values in DB, we already have
  Bug 14717: Prevent 0000-00-00 dates in patron data (3.21.00.023)

Test plan:
  prove t/db_dependent/Circulation/dateexpiry.t
  prove t/db_dependent/Koha/Patrons.t
must return green

Signed-off-by: Roch D'Amour <roch.damour@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Conflicts:
	C4/Circulation.pm
	t/db_dependent/Koha/Patrons.t

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 9f075a4fdb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-27 10:43:21 +02:00
Victor Grousset 5eb8bcb4ea Bug 20098: Inventory tool: CVS export: fix itemlost column
It was mapped with "lost" instead of "itemlost".

== Test plan ==
1. Have a lost item
2. Go to staff:/cgi-bin/koha/tools/inventory.pl
3. Tick "Optional filters" → "items.itemlost" →
      "name of Authorized values for the lost state"
4. Tick "Export to CSV file"
5. Submit
6. Open the CSV
7. Check that the lost item is in the list
8. You should observe that the "Lost status" column is empty for all items
     This is the problem
9. Apply this patch
10. Click submit to re-export the CSV
11. Open the CSV
12. Check that the lost item is in the list
13. You should observe that the "Lost status" column now filled with the
      expected values.
14. Smile because it works! :D

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Maksim Sen <maksim@inlibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 756c95477d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-12 16:16:54 +01:00
Kyle M Hall eb005e767e Bug 19530: Don't update the date arrived for closed transfers
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 9a6c8f6c1e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-08 10:34:41 +01:00
Mark Tompsett 82010132eb Bug 19530: Added commentary for last test when prove -v
Before patch, prove -v had no comment for the last test.
After patch, it says something in line with second last test.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 3fefcead15)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-08 10:34:36 +01:00
Kyle M Hall f1fc90de95 Bug 19530: Prevent multiple transfers from existing for one item
We have found multiple open branch transfers for a given item. While I'm not sure how it is happening at this point, it seems that it would make sense to cancel any existing branch transfers when initiating a new one.

Test Plan:
1) prove t/db_dependent/Circulation/transfers.t

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 00fbf1878e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-03-08 10:34:20 +01:00
Nick Clemens 605e6fb59f Bug 19806: Add classes to itemnotes in issues table
To test:
1 - Checkout an item with both public and non-public notes
2 - Note the notes display and both have circ-hlt class
3 - Apply patch
4 - Ensure display has not changed
5 - Note notes now have classes 'item-note-public' and
'item-note-nonpublic'
6 - Sign off

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 03864feb38)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-26 14:22:28 +01:00
Fridolin Somers 52e75e3806 Bug 20276: Fix GetCourseItem call to get itemnumber
In 17.05.x :
In course_reserves/add_items.pl we now get the item via Objects.
This line:
 66     my $course_item = GetCourseItem( itemnumber => $item->{'itemnumber'} );
Should be:
 66     my $course_item = GetCourseItem( itemnumber => $item->itemnumber );

This is corrected since 17.11 by :
Bug 18276: Remove GetBiblioFromItemNumber - Course reserves

Test plan :
1) Create a course reserve and add items.
2) Correct information must be displayed on the detail page of the course
reserve, on staff and OPAC interface.
3) Try to add a non existing barcode, you get the page with a message

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-26 13:41:21 +01:00
Fridolin Somers 095a63b313 Update release notes for 17.05.09 release
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-23 10:29:07 +01:00
Fridolin Somers 5238e1abdb Increment version for 17.05.09 release
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-23 10:24:14 +01:00
Koha translators c85b5d3963 Translation updates for Koha 17.05.09 2018-02-23 06:13:30 -03:00
Fridolin Somers 982bb237ab Bug 19847: (17.05.x follow-up) rebase error on C4::Biblio::GetMarcBiblio 2018-02-19 14:08:43 +01:00
Julian Maurice 6f756ba4e9 Bug 19730: (follow-up bug 17196) Use biblio_metadata.timestamp in export_records.pl
Since bug 17196, biblioitems.timestamp is not always updated after a
change in the MARC record.
Filtering should be based on biblio_metadata.timestamp instead.

REVISED TEST PLAN
-----------------
0. Do not apply patch

1. Find a biblio record, remember the biblionumber for step 3

2. Edit the record, modify a field (e.g. 003, 015$q) that is
   not mapped to a DB column, so biblio_metadata.timestamp will
   be modified but not biblioitems.timestamp

3. In MySQL with the koha database selected:
   > select timestamp from biblio where biblionumber=###;
   > select timestamp from biblio_metadata where biblionumber=###;
   -- you'll need to change the ###'s based on the biblionumber
      you remembered in step 1.
   -- the two timestamps will differ.
   -- Remember the timestamp of biblio_metadata for step 4.

4. Run this command:
   $ sudo koha-shell -c bash kohadev
   $ export DATE="YYYY-MM-DD HH:mm:SS"
   -- use the timestamp remembered in step 3.

5. Run this command:
   $ ./misc/export_records.pl --date="$DATE"
   $ ls -la koha.mrc
   -- the file should be 0 bytes.

6. Run this command:
   $ exit
   $ git bz apply 19730
   $ restart_all
   $ sudo koha-shell -c bash kohadev
   $ export DATE="YYYY-MM-DD HH:mm:SS"
   -- use the timestamp remembered in step 3.

7. Run this command:
   $ ./misc/export_records.pl --date="$DATE"
   $ ls -la koha.mrc
   -- the file should be a lot more than 0 bytes.

8. Run this command:
   $ /home/vagrant/qa-test-tools/koha-qa.pl -v 2 -c 1
   -- this should pass.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f9fa822736)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-19 14:01:53 +01:00
Marcel de Rooy e9e39a68c3 Bug 20126: Add simple test for ModBiblioMarc
Just to confirm that we see record length and base address in a record
that has been passed through ModBiblioMarc.

Test plan:
Run the test.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1aebb1d476)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-19 14:00:03 +01:00
Marcel de Rooy f589b2dbc5 Bug 20126: (follow-up bug 10455) Restore MARC field length calculation in ModBiblioMarc
Trivial fix. Problem raised by bug 10455.

Test plan:
[1] Create or edit biblio record.
[2] Save and check leader field lengths in MARC view.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ef7f119b1e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-19 13:54:22 +01:00
Alex Arnaud b2a3e93035 Bug 19443: Remove duplicate message when editing existing patron
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit a522df7dd9)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-19 11:36:56 +01:00
Alex Arnaud 4a1b67d83e Bug 19443: Wrong HTML in patron creation page (members/memberentry.pl)
The form provided on top of the page if Koha find a duplicate
patron is not closed. This cause some trouble.

Test plan:

 - Edit the syspref IntranetUserJS and type the following code:
   "$(document).ready(function() {
    $("#memberentry_library_management").insertBefore("#memberentry_identity");
    });"
 - create a patron so that Koha will warn you about a duplicate one,
 - click on "Not a duplicate. Save as new record",
 - you should get error(s) about empty field(s).
   Note that now, the library management part's fields are empty or
   reset to default

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 27fca7aceb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-19 11:36:19 +01:00
Jonathan Druart d4897d2d6a Bug 19975: Fix search by tags at the OPAC
This bug has certainly be caused by
  commit 091d6c513b
    Bug 17843: Replace C4::Koha::getitemtypeinfo with Koha::ItemTypes

The reason is quite simple, in Koha::ItemType->translated_description
(called in opac-search.pl l.229) there is an eval to know if we have
access to the translated description of the item type, to avoid
retrieving it again.

The evaluation of $@ later in opac-search.pl is supposed to test the 2
eval made few lines before (a "normal" search, without tags), but
$@ contains the error message from the *last* eval command.
So we are raising an error that have been correctly handled in
Koha::ItemType.

Test plan:
At the OPAC, click Tag cloud, then click any of the tags

=> Without the patch you get
Koha::ItemType::get_column generated this error: DBIx::Class::Row::get_column(): No such column 'translated_description' on Koha::Schema::Result::Itemtype at /usr/share/koha/lib/Koha/Object.pm line 307

=> With the patch applied the page is correctly displayed

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit fc172d3252)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-08 10:55:01 +01:00
Jonathan Druart 8fdbaee0e4 Bug 19985: Make TestBuilder.t pass even if default_circ_rules is not empty
This table cannot contain more than 1 row, so we need to remove its data
before trying to generate a new entry.

Test plan:
Set a default circ rule
 prove t/db_dependent/TestBuilder.t
should return green

Without this patch you get:
    #   Failed test 'TestBuilder should be able to create an object for every source'
    #   at t/db_dependent/TestBuilder.t line 78.
    #          got: '1'
    #     expected: '0'
    # The following sources have not been generated correctly: DefaultCircRule
    # Looks like you failed 1 test of 1.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 55d8ea59e7)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-08 10:52:06 +01:00
Kyle M Hall c2d7c71c91 Bug 18477: Populate article_requests table values for AR_PENDING notices
The default AR_PENDING letter does not print populate <<article_requests.*>> fields.

Test Plan:
1) Enable article requests ( syspref: ArticleRequests => Enable, Circ and fine rules ALL/ALL (or a given category/itemtype): Article requests => Yes )
2) Search for a title, click in to catalog detail, click 'Request Article' button.
3) Select Patron
4) Fill out request information
5) Click 'Place request'
6) Go to notices in patron record, inspect 'Article Request Received' notice. You should see the request information from step 4, but it doesn't display.
7) Apply this patch
8) Repeat steps 2-6, not the fields now display!

Signed-off-by: Eric Phetteplace <phette23@gmail.com>

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e1a61134eb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-08 10:49:26 +01:00
Jonathan Druart 4177b81d49 Bug 18477: Add tests
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 2a0423778e)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-08 10:48:26 +01:00
Nick Clemens 1f34c499c8 Bug 19596: Don't try to get hold or items count for non-existent biblios
Patch applies and works as expected.

Signed-off-by: Dilan Johnpullé <dilan@calyx.net.au>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit c42053021b)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-05 11:34:25 +01:00
Jonathan Druart 7998c6bc64 Bug 19705: Try to fix random failures from DecreaseLoanHighHolds.t
No idea if it will do the trick, wait and see...

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a6d6b0fdf6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-05 11:27:41 +01:00
Fridolin Somers 1a6e2e54ba Revert "Bug 19669: (QA follow-up) Remove itemstypes.plugin"
This reverts commit 6338895489.
2018-02-05 11:25:11 +01:00
Jonathan Druart 1c098c31dc Bug 19455: Prevent SwitchOnSiteCheckouts.t to fail randomly
If categorycode is 'X', the test will fail

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 307e55a7de)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 10:36:11 +01:00
Jonathan Druart 9b220314b2 Bug 15770: Do not format numbers if too big
At several places we got the following error if we use numbers too big
for Number::Format
Template process failed: undef error - round() overflow. Try smaller
precision or use Math::BigFloat at /home/koha/src/Koha/Number/Price.pm line 44

It make the app explodes.
The goal here is to handle these errors gracefully and easily.

Test plan:
- Add a manual fine to a patron of 100000000000000
- Create a patron category with an enrolment fee of 123456789012345

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 937237a1f2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:45:54 +01:00
Olivier Crouzet 7084f46895 Bug 19971: Typo in the comments of parseQuery routine
TEST PLAN
---------
1) Run these commands:
    git checkout master
    git pull
    perldoc C4::Search
2) look for parseQuery
    -- NOTE: The sample code provided below this heading has
             the wrong function name!
3) Run these commands:
    git checkout -b bug_19971 origin/master
    perldoc C4::Search
4) look for parseQuery
    -- NOTE: The wrong function name is corrected.
5) Run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 431d315534)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:38:08 +01:00
Te Rauhina Jackson 3097ef634e Bug 19221: Onboarding tool says user needs to be made superlibrarian
I changed the "To give new patron superlibrarian permissions go to:"
message to "To edit patron permissions, go to:". Please clarify if this
is clearer or not.

Test plan:
1) Apply patch
2) Go through the web installer
3) At the create koha administrator patron step, notice that at the
   bottom, there is a message saying "To edit patron permissions, go
   to:"

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 42ff4bfca6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:37:26 +01:00
Josef Moravec 761b3c7699 Bug 19825: Make links to biblios on pending offline circulation page working again
0) Do not apply the patch
1) Have pending offline circulation operations - you can use standalone
application, Firefox add-on or built-in offline circulatin client - it
does not matter in this case
2) Go to Circulation -> pending offline circulation actions
3) You see all barcode in red and without links - even if the item and
biblio existed
4) Apply the patch
5) Repeat 1-3, now you should see the links to biblio on existing items

Note: Don't add non-existent barcodes actions and payment actions unti
bug 19771 is not fixed

Signed-off-by: Charlotte Cordwell <charlotte.cordwell123@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 14a3e2fddf)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:36:10 +01:00
Grace Smyth 772275440e Bug 19839: Removed Warning (invoice.pl - uncertainprices)
Test Plan
[1.] Check the patch to see that I have removed:
$template->param( uncertainprices => 1 ); from line 204 as Mr Druart has instructed to do
(to get to the patch see the comment above by Mr Druart)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit db7e3a41b1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:34:52 +01:00
Fridolin Somers 5af0142725 Bug 17682: DBRev 17.05.08.002
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:18:18 +01:00
Jonathan Druart e114bed04b Bug 17682: Replace 2 occurrences in de-DE and nb-NO
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 7b4b8699a6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:17:47 +01:00
Charlotte Cordwell ee225fd477 Bug 17682: (follow-up) Change URL for Google Scholar in OPACSearchForTitleIn
Amended the sql statement so it only affects the http://www.scholar.google.com url

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5bf7600456)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:15:28 +01:00
Charlotte Cordwell cac9c271b8 Bug 17682: Change URL for Google Scholar in OPACSearchForTitleIn
1)apply patch
2) go into administration --> search for OPACSearchForTitleIn
3) *click to edit*
4) look at the link and read the google scholar one.
5) check that the start link is https://scholar.google.com.
6) http://www.scholar.google is incorrect

Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 17a0a796bb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 09:15:04 +01:00
Mirko Tietgen 30d1c0365a Bug 20072 - Fix build-git-snapshot for Debian source format quilt
With bug 18696 we need a few tiny changes to build-git-snapshot:
- Debian revision number for debian/changelog
- "orig" in the file name for the tar.gz archive

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-02-02 08:42:52 +01:00
Nick Clemens d635ed5c8c Bug 16603: (QA follow-up) Add a FIXME
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 479945b208)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:12:13 +01:00
Owen Leonard 104f9b0046 Bug 16603: When processing uploaded offline circulation file, "apply directly" option fails
This patch is a temporary mitigation of whatever the real problem is.
The patch hides the "Apply directly" button so that the option isn't
available.

To test, apply the patch and generate a .koc file with some
transactions. Upload the file via Circulation -> Offline
circulation file upload. After the file is uploaded, you should see only
a "Add to offline circulation queue" button, which should work
correctly.

Signed-off-by: Grace Smyth <gracesmythh@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 18e5177e1a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:11:34 +01:00
Nick Clemens b93521a444 Bug 19677: Properly escape enumchrom/serialseq data
Some serial issues use angle brackets for denoting certain data.
Currently this is not displayed in Koha. This patch escapes the data so
that angle brackets will display.

To test:
1 - Add an enumchron field to an item containg angle brackets:
"This is a <test>"
2 - View the record in the staff and opac, not the field displays as:
"This is a"
3 - Apply patch
4 - Note full text now displays

Signed-off-by: Charlotte Cordwell <charlotte.cordwell123@gmail.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 8be48eeb51)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:10:24 +01:00
Mirko Tietgen 25a26ad97e Bug 19783: Move check_kohastructure.t to db_dependent
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 6c7ea2aeb1)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:06:40 +01:00
Jonathan Druart eef58349ae Bug 19422: Make sure it will never happen again
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 84bc17a894)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:05:55 +01:00
David Bourgault bb2ff03ff7 Bug 19422: Missing DROP TABLES in kohastructure.sql
Adds DROP TABLE statements to the following tables
    - article_requests
    - biblio_metadata
    - deletedbiblio_metadata

Test plan :
Clean your database by running 'mysql < kohastructure.sql'.
Without patch you'll get error messages.
With patch everything will work fine, no warnings.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 2386e33dbb)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:05:43 +01:00
Mirko Tietgen ac09cc26a1 Bug 20042: 00-load.t fails when Elasticsearch is not installed
00-load.t fails when Elasticsearch is not installed. Blocks packaging.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 5c2a90e80c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 09:03:17 +01:00
Grace Smyth b986d5071f Bug 19987: If no z39.50/SRU servers the button should not show
Test plan:
[1.] Load the patch and make sure you have some Z39.50/SRU servers
     (Administration => Z39.50/SRU servers administration)
[2.] Then go to authorities and notice that the 'New from
     Z39.50/SRU' button is there
[3.] Next go to cataloging and notice that the 'New from Z39.50/SRU'
     button is there too
[4.] Now make sure you have no Z39.50/SRU servers (remove the
     servers)
     (Administration => Z39.50/SRU servers administration)
[5.] Go to authorities and notice that the 'New from Z39.50/SRU'
     button is not there
[6.] Lastly go to cataloging and notice that the 'New from Z39.50/SRU'
     button is not there too

:)

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

I added a missing [% END %] during signoff. Hope no one minds!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 0b3e70c961)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:57:05 +01:00
Julian Maurice 06d7942eb5 Bug 19977: Open only .pref files in Local Use tab (sysprefs)
Test plan:
1. Open .../prog/en/modules/admin/preferences/circulation.pref
with vim (check that it creates a .circulation.pref.swp in the same
directory)
2. Go to the "Local Use" tab in admin/systempreferences.pl
3. Confirm that the page works normally

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit fe2560c06a)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:55:27 +01:00
Jonathan Druart bad3c9fec7 Bug 19968: Add missing use Date::Calc statement
It has been reported than the missing use statement can cause a
compilation error:
Undefined subroutine &Date::Calc::Today called at
/usr/share/koha/intranet/cgi-bin/cataloguing/value_builder/unimarc_field_100.pl
line 75.

Test plan:
Use this UNIMARC plugin and make sure it fixes the error or at least
does not break it

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 3f38b34445)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:31:27 +01:00
Jonathan Druart 3c7f2da486 Bug 19973: Fix SQL syntax error in uk-UA/mandatory/sample_notices.sql
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit a44804f015)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:30:11 +01:00
Mark Tompsett 6b3287ffd5 Bug 19937: Silence warnings t/db_dependent/www/batch.t
TEST PLAN
---------
1) Run the following on a kohadevbox:
    git checkout -b bug_19937 origin/master
    sudo koha-shell -c bash kohadev
    prove t/db_dependent/www/batch.t
    cat /var/log/koha/kohadev/plack-error.log

    The following errors are triggered at the end of the log file:
        Use of uninitialized value in array element at
        /home/vagrant/kohaclone/tools/batch_records_ajax.pl line 50.
        Use of uninitialized value $results_per_page in numeric eq (==) at
        /home/vagrant/kohaclone/tools/batch_records_ajax.pl line 53.
        Use of uninitialized value in uc at
        /home/vagrant/kohaclone/C4/ImportBatch.pm line 1120.

2) Run the following on a kohadevbox:
    exit
    git bz apply 19937
    restart_all
    sudo koha-shell -c bash kohadev
    prove t/db_dependent/www/batch.t
    cat /var/log/koha/kohadev/plack-error.log

    The log file will end with the restarting of plack, not the
    errors.

3) run koha qa test tools

Signed-off-by: Lee Jamison <ldjamison@marywood.edu>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended handling of $results_per_page.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1107590df2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:26:34 +01:00
Olli-Antti Kivilahti 862b732c0a Bug 19483: Fix test plan in t/db_dependent/www/*
t/db_dependent/www/* crashes test harness due to misconfigured test plan

prove t/db_dependent/www/

without defining KOHA_INTRANET_URL
bails out and marks the whole test suite as failed.
Test suite should not be failed if this optional WWW::Mechanize test
suite is not activated.

After this patch, the tests are properly skipped without failing the
whole tests.

This is important when running all tests under t, as this needlessly
fails the test suite.

Also handling of 'skip_all' is inconsistent in t/db_dependent/www
-tests, so this normalizes it to skip_all instead of bail_out

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit f25d650a1c)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
2018-01-31 08:24:56 +01:00