Commit Graph

25012 Commits

Author SHA1 Message Date
Katrin Fischer 16049ee599 Bug 15560: Fix display of multiple branches and locations in pending reserves report
The patches from bug 12152 broke the display on the pending reserves/
holds to pull report when items from multiple branches and with
multiple locations were displayed. The table cells were left empty.

To test:
- Add a record with at least 2 items from different locations and
  holdingbranches
- Open the 'holds to pull' report
- Verify all branches and locations show with their correct
  description

Signed-off-by: Natasha <tasham_8@hotmail.com>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 363cb9c02e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:41:55 +01:00
Julian Maurice e10f011dd1 Bug 15572: TransformHtmlToMarc - rewrite the loop
This rewrites the while loop into a for loop, so $i still gets
incremented when we call next

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Make sense. Add readability. Infinite loop no more possible.

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 1eab5c199d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:23:16 +01:00
Jonathan Druart 45e10ea437 Bug 15572: Add tests for TransformHtmlToMarc
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 467355d846)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:23:16 +01:00
Frédéric Demians 44bd1995bf Bug 15572: Follow-up to fix error on authority creation
Bug 6657 modified the way C4::Biblio::TransformHtmlToMarc operates in order to
solve an issue occuring during biblio record cataloguing. But this function is
also used by authorities cataloguing, and the code in this case is irrelevante.
This followup allows to distinguish for which kind of record
TransformHtmlToMarc is called: biblio/authority.

A bug appears in authority creation without this patch in some circunstances:
when authid is linked to 001 field.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Tested with a new authority record

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 2ca9bd5dc2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:23:16 +01:00
Jonathan Druart f0c36157ef Bug 15607: batch patron mod - do not update dates if not given
Bug 15332 fixed a bug but introduced a bigger one. Even if dateenrolled and
dateexpiry are not modified, they will be updated to today.
Indeed, dt_from_string returns today without parameters.

Test plan:
- Set dateenrolled and expirydate for a patron
- Using the batch patron mod tool, update any field but dateenrolled and
expirydate.
=> Without this patch, the 2 date fields should be set to today
=> With this patch applied, the 2 date fields should not have been
modified.

Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 2505a3d840)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:19:10 +01:00
Marc Véron d1e8575926 Bug 15579: Fix permission for batch record modification
To test:

- For a patron, permissions 'catalogue' and 'records_batchmod' only
- Log in as this patron
- Go to /cgi-bin/koha/tools/batch_record_modification.pl

Without patch: You have no permisson to acces the page.
With patch: Page 'Batch record modification' displays as expected.

(Amended to fix wrong test plan)

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit e4715453e3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-25 12:17:28 +01:00
Nick Clemens fce540acea Bug 15512 - Minor regression caused by Bug 7369 - warn on deleting item not triggered
To test:
1 - Delete an item using the Action menu
2 - There is a js error and no warning box
3 - Apply patch
4 - Delete an item using the action menu
5 - You should get a confirmation box as expected

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 6233c34484)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:22:25 +01:00
Jonathan Druart 38b29a78f8 Bug 15477: (follow-up) Bug 14100: Better errors handling
On bug 14100, the patch "Better errors handling" introduced an ...
error.
The user always get "An error occurred when updating this translation"
although it has been updated in DB.

Test plan:
Edit translations for an item type: you should not get an error when
everything went fine.

Tested on top of 15487, error message does no longer appear.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit e706cd18f0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:20:21 +01:00
Jonathan Druart 47be997be0 Bug 15487: Fix encoding issue on localization
It has been introduced
  commit ed0ff59152
    Bug 11559: Supporting changes for Rancor

Pushed at the same time as bug 14100.

Test plan:
Add/update translations for item types, confirm there is no encoding
issues.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 7fdb4d21d6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:20:21 +01:00
Liz Rea 44358716ba Bug 15394 - Tidy up error messages in OPAC lists
To test:

Create a list in the OPAC, observe the message
Create another list in the OPAC with the same name, observe the message
Delete a list, observe the message

Check the patch itself, look for typos.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit e7e1da85a5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:10:17 +01:00
Lyon3 Team b6f1cc60b1 Bug 15501 - Planned Irregularities are deleted when modifying subscription
Add a warning to avoid saving a subscription whitout testing prediction pattern
when there are planned no published issues

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Ran through test plan, looks all good.

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d4c5bce132)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:08:05 +01:00
Jonathan Druart e4175ee89d Bug 15473: Make Koha::Objects->find accepts 0 and '' as a key
This bug has been found after bug 15381 was pushed:
If you go on authorities/authorities.pl, you expect a form to create a
 authorities with a "Default" authority type.
Now, it explodes:
    Can't call method "authtypetext" on an undefined value at
    /home/koha/src/authorities/authorities.pl line 665.

Koha::Objects->find does not want to search if the key does not exist
(undef, '', 0). But actually it should only be a coward if it is not defined.

Moreover this is the default behavior of the DBIx::Class find method.

Test plan:
  prove t/db_dependent/Koha/Objects.t
should return green
and
  GET /cgi-bin/koha/authorities/authorities.pl
should not make everything explode.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Find this after signing 15470 :)
Test pass, new auth (Default) created, no errors.

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 6cf157f993)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 09:02:36 +01:00
Jonathan Druart 2fbd04103a Bug 15367: Do not display repeatable patron attributes in the batch patron modification
The repeatable patron attributes are not correctly managed and can cause
data lost. To avoid that, the easier way is not to display them in the
batch patron modification tool.
This should be implemented, as a new enhancement.

Test plan:
Create some patron attributes, some should be repeatable.
Use the batch patron modification tool to modify patrons.
With this patch, the patron attributes marked as repeatable won't be
display anymore.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, no koha-qa errors

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 9030800e78)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-15 08:59:56 +01:00
Katrin Fischer c29372726a Bug 15511: Fix tabbed display on OPAC patron account summary page
Some variables were not correctly renamed in a previous patch,
resulting in the fines tab of the OPAC patron summary page
not showing correctly.

To test:
- Go to the OPAC patron account
- Check the display of the Checkouts, Fines and Holds tabs on
  the summary page
- Verify that with the patch, the display is corrected

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bca01829c9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 15:05:07 +01:00
Jonathan Druart 4819f61b7b Bug 15466: Do not assume $values_in is a hashref
It could be undefined.
Test plan:
prove t/db_dependent/Suggestions.t
should return green.

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8235cbb0d4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 14:55:36 +01:00
Jonathan Druart 2c84b8a78b Bug 15412: Enable dropdowns date selector when suspending holds
It seems to be the way to fix that
https://stackoverflow.com/questions/13649459/twitter-bootstrap-multiple-modal-error

Test plan:
1 - Place a hold through the opac
2 - View your account->Holds
3 - Click suspend hold
4 - You should be able to select a date using the arrows and dropdowns

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 01d48a7825)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 14:49:08 +01:00
Jonathan Druart 0bbefeba82 Bug 15493: Use the correct CSV profile when exporting records from the export tool
The CSV profile used is not the one the user has chosen, but the one
defined in the pref ExportWithCsvProfile.

It's caused by a wrong variable name csv_profile vs csv_profile_id

Test plan:
Define 1+ csv profiles
Set ExportWithCsvProfile with 1 of these profile
Use the export tool to export some records using a csv profile.
Without this patch, the csv profile used, will always be the one defined
in ExportWithCsvProfile.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 47e6df5fe4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 14:27:05 +01:00
Jonathan Druart 1b5f4b8b9b Bug 15453: Assign the correct shelfid to the download list links
Introduced by bug 14544, the shelfnumber is not correctly passed to the
template.
The shelf variable is passed to the template, to access the shelfnumber,
we need to get shelf.shelfnumber.

Test plan:
At the intranet, try to download a list.
Without this patch it won't work.

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b6ded94433)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 14:24:54 +01:00
Marc Véron 5686ba50ba Bug 15462 - Unable to renew books via circ/renew.pl
To verify: Got to circ/circulation.pl and try to renew an item.
Result: Can't call method "single" without a package or
        object reference at /usr/share/kohaclone/circ/renew.pl
        line 57

To test:
- Apply patch
- Try to renew items that are or are not checked out. Error
  no longer occurs.

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 68dee0de8e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-12 14:08:56 +01:00
Jonathan Druart 91a41dda87 Bug 15344: Remove one occurrence in circ/circulation.pl
In C4::Circulation::CanBookBeIssued, $borrower->{flags} is called and
should be populated by GetMemberDetails

It fixes the following error on checking out:
Can't use string ("1900156") as a HASH ref while "strict refs" in use at
/home/koha/src/C4/Circulation.pm line 813.

Note: Error occurs with patrons with staff permissions, not with 'normal' patrons.
Error is fixed with this patch.
Signed-off-by: Marc Véron <veron@veron.ch>

(cherry picked from commit e2a3b93860)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-05 09:14:52 +01:00
Brendan Gallagher b392ebb815 Bug 13022: Update DB rev (3.22.01.001) 2016-01-04 08:35:32 +01:00
Kyle M Hall c621641bf3 Bug 13022 [QA Followup] - Highlight the results with inaccurate status, add explanation when mouse hovers over.
Bug 13022 [QA Followup] - Revert changes in whitespace back to original for items count lines

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit df2bab8f61)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-04 08:29:11 +01:00
Kyle M Hall 6e0a32a263 Bug 13022 [QA Followup] - Allow the pref to be unset for unlimited item status checks
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 7ab9d7d91d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-04 08:29:11 +01:00
Kyle M Hall f552e658e4 Bug 13022 - Hardcoded limit causes records with more than 20 items to show inaccurate statuses
If a record has more than 20 items, all the items over 20 will show as
available on the search results even if they are not!

This is a hard coded limit in the Search module. This number should be
configurable.

Test Plan:
1) Create a record with more than 20 items
2) Set all the items to waiting holds or in transit
3) Search for results that will include that item
4) Note some say they are available even though they are not
5) Apply this patch
6) Run updatedatabase.pl
7) Set the new system preference MaxSearchResultsItemsPerRecordStatusCheck
   to a number larger than the number of items on your record
8) Re-run the search
9) Note that the hold and transit statuses for the items are now correct

Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace@sub.su.se>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit d3184fa85b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-04 08:29:10 +01:00
Magnus Enger 8314d1beb5 Bug 15304: Remove Norwegian strings from nl-search.tt
When nl-search.pl gets data from the Norwegian national patron
database, it does so in an XML format that has Norwegian element
names. nl-search.pl displays the data with the Noregian element
names as labels. This means Norwegian words turn up in translations,
which is messy. This patch replaces the Norwegian labels with
English ones.

To test:
- Only Norwegian libraries and vendors get access to search against
  the national patron database, so a proper functional test is not
  possible
- Alternative 1: Just have a look at the nl-search.tt template
  before and after the patch and verify that after the patch the
  Norwegian strings that would be visible to a user are gone
- Alternative 2:
  - Verify that e.g. en-GB-staff-prog.po contains the Norwegian
    string "kjonn"
  - Apply the patch
  - Create new .po files with e.g. "./translate create en-GB"
  - Verify that "kjonn" is now gone from en-GB-staff-prog.po

Version 2: Tweak a couple of labels to be more in line with labels used
elsewhere in Koha, to avoid variants when translating.

Version 3: Replace e.g. "Gender: </span>" with "Gender:</span> " to
avoid similar-except-for-whitespace strings in translation.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
A few new strings, all previous removed.
No koha-qa errors

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bd4a683052)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-04 08:17:49 +01:00
Hector Castro 65e8776f01 Bug 15170 - Add 264 field to MARC21*DC.xsl
Modify MARC21*DC.xsl to add RDA 264 field

To test:
- Copy from LOC z39.50 the Maxwell's handbook for RDA (ISBN
  9780838911723)
- Look the field 264 in framework, save record
- Open this URL in OPAC

  /cgi-bin/koha/unapi?id=koha:biblionumber:41201&format=marcxml

  And play with id (the number of new record for Maxwell book) &
  format parameters
  Test format=rdfdc, format=srw_dc and format=oai_dc
- Notice that <dc:publisher> and <dc:date> are not present
- Apply this patch
- Reload the URL for the three formats
- You will see the tags publisher and date are taken from 264

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 7d16555427)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 12:16:51 +01:00
Martin Renvoize f299790bd9 Bug 14034: Fix logout on refresh for shibboleth
This is similar to bug 12877

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

While this is missing a detailed test plan, what I did to test was

1/ Login to koha .. it works
2/ Apply patch
3/ Login to koha .. it still works, no regressions. I can't test the
shibboleth part but it doesnt break anything else so I'm happy to sign
off

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>

We had to implement this fix for one of our customers using Shibboleth.
Can verify that it fixes the issue (which, incidentally, breaks
stage-marc-import since that depends on a constant sessionID).

Passing QA (verified with QA tools). Thanks, Martin!

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit 5c581ccdd0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 11:53:54 +01:00
Katrin Fischer ede83df30b Bug 14397: Fix tiny typo in database documentation
Fixes Foriegn to Foreign.

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 89a058787a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 11:34:49 +01:00
Kyle M Hall 082c69effa Bug 15447 - log4perl.conf does not have __LOG_DIR__ replaced when installing
Since the introduction of Koha::Logger, it appears that the
log4perl.conf config file has been broken. The references to __LOG_DIR__
is not being replaced.

Test Plan:
1) Apply this patch
2) Run 'perl Makefile.PL'
3) Run 'make'
4) Open blib/KOHA_CONF_DIR/log4perl.conf with a text editor
5) Note the log file paths are correctly set, and do not have
   __LOG_DIR__ in them.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 30f5b7b0a6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 11:28:56 +01:00
Kyle M Hall 9f7432a480 Bug 15383 [QA Followup] - Change language used
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 58699d77e7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 11:27:00 +01:00
Marc Véron 2316c94fe6 Bug 15383 - Opac: Autority details: Fix translation issues with a tags
Fix translation issue in opac-auth-detail.tt and opac-auth-MARCdetail.tt
(string splitting by link tag) making it hard to have a gramaticaly correct
translation.

To test:
- Apply patch
- In OPAC, go to search an Authority and display details (View full heading)
- Verify the line "Usage in records: x" in both Normal view and MARC view

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Not sure if "Usage in records" is the best wording, but I have no great
options either, "Number of records used in:"?

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3d3c53ec01)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-01-03 11:27:00 +01:00
Frédéric Demians 524b4cb0ff Bug 15258: Fix Perl scripts declaring unused variables
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

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

All affected files tested with `perl -c`.
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>

(cherry picked from commit ff1579de6d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:32:53 +01:00
Frédéric Demians d614dc78aa Bug 15258: Prevent unused declared variables
Add a perlcritic rule to 00-perlcritic.t to prevent unused declared
variable.

TO TEST:

- Apply the 1st patch (unit test)
- Run the UT:
  prove -v t/00-testcritic.t
- Note that several Perl script fail
- Apply the 2nd patch
- Run the UT, and confirm it passes.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
All tests pass successful.

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit c7ec79b839)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:32:53 +01:00
Nicole C. Engard 1dcb57f84e Bug 13136: Add missing help file for label-manage.pl
This patch adds in a help file for the new label-manage page.

To test:

* visit label creator
* click manage and choose an option
* click 'help' and confirm the file loads
* repeat for all options under manage

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Tab char corrected

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 8a02409d18)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:29:29 +01:00
Olli-Antti Kivilahti 52a9bed15f Bug 15080 - ./translate tool should tell if xgettext executable is missing
Just upgraded our Koha container to 14.04 and noticing the
misc/translator/translate doesn't work.  This is because of a missing
package gettext.

This patch makes ./translate die with a helpful suggestion to install
gettext if xgettext-program is missing.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  I can reproduce the bug by desinstalling 'gettext' package on a Debian
  box. I confirm that without this patch, 'translate' command fails
  miserably. Suggesting to install gettext package is welcomed.

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit 37b0e2ce9c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:26:21 +01:00
Mirko Tietgen 2763eb87de Bug 15396: fix MARC21 Leader plugin label '1-4 Record size'
The plugin label says "1-4 Record size", but it's actually 0-4.

http://www.loc.gov/marc/bibliographic/bdleader.html

Test plan:
-apply patch
-in cataloging, open a record in a framework that uses the plugin
-open LEADER/000 and check that the label says "0-4 Record size" now

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Good catch, fixed tab, no errors.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 4e61aa5ef5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:23:48 +01:00
Katrin Fischer 855cd2a400 Bug 14853: Change 'Fund' to 'Shipping fund'
Changes the 'Fund' to 'Shipping fund' so it's clear
what the fund setting is used for.

To test:
- Receive a new shipment
- Verify that 'Shipping fund' displays on the parcels page
- Search for your invoice
- View invoice details
- Verify that 'Shipping fund' displays on the invoice page

Followed test plan (changed lines: '...cost' -> '...fund')
Display OK on both places.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 3f68107b10)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:22:42 +01:00
Marc Véron e33bcec688 Bug 15340: Translatability: fix issue with 'or choose' splitted by <strong> tag
This patch fixes a translatability issue due to <trong> tags.

To verify:
- Make sure that you have some entries in 'Cities and Towns'
  ( Home > Administration > Cities )
- Edit the main address of a patron's details
- Locate field "City", at the right you have the text 'or choose'
  followed by a drop-down ('choose' is bold)
- change language e.g. to German, the text reads 'or auswählen'
  (instead of 'oder auswählen')
- This is due to the <strong> tags around 'choose'

To test:
- Apply patch
- Verify that the <strong> tags around 'choose' are removed in:
    koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
    koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit a85fd85545)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:22:03 +01:00
Kyle M Hall 2f7f6e9ac0 Bug 15409 - Plugins section missing from Admin menu sidebar
The sidebar menu in the Admin area of Koha is missing a section for
Plugins.

Test Plan:
1) Apply this patch
2) Log in with a user that has plugin permissions
3) Browse to a page with the admin menu sidebar, such as
   /cgi-bin/koha/admin/transport-cost-matrix.pl
4) Note the new Plugins section with a link to manage plugins
5) Log in with a user that has no plugin permissions
6) Revisit the same page, note the Plugins section is no longer visible

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 65d3203525)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:21:24 +01:00
Marc Véron 99fc3af0a6 Bug 15432: t/db_dependent/Letters.t depends on external data/configuration
To test:

- Set system preference LetterLog to 'Don't log'
- prove t/db_dependent/Letters.t
- Result: Fails on test 62 - Successfully sent claim
- Apply patch
- Test again
- Result: Pass OK

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: removed the bug reference, not needed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c92b1556ef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:16:16 +01:00
Aleisha 776f738382 Bug 15373: More changes of Zip to ZIP on intranet
To test:

- Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form.
- Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form
- Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]'
- Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title
- Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with first patch.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5df49b04ef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:15:11 +01:00
Aleisha 6438df7287 Bug 15373: Changing Zip to ZIP on OPAC and Intranet
To test:

1) Login to OPAC --> You personal details.
2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details.
4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact
5) Click Edit
6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact

Signed-off-by: Barry Cannon <bc@interleaf.ie>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with second patch.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3da8abcfef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:15:11 +01:00
Mark Tompsett 7f708a361b Bug 15382: 245$a visibility constraints not respected in opac-MARCdetail.pl
This tiny change determines if the bibliotitle should be set or not
in accordance with the 'Advanced constraints' visiblity setting for
OPAC.

TEST PLAN
---------
1) Find a record detail in OPAC
2) Click 'MARC view'
   -- 245$a should be visible.
3) In a new tab, log into the staff client
4) Click 'Koha administration'
5) Click 'MARC bibliographic framework'
6) Click 'MARC structure' for the framework of
   the record displayed in OPAC.
7) Search for tag: 245, and click 'Search'
8) Click 'Subfields'
9) Click 'Edit' beside the a subfield.
10) Click 'Advanced constraints'
11) Uncheck 'OPAC'
12) Click 'Save changes'
13) In the OPAC tab, refresh
    -- 245$a (Title) will still be visible!
14) Apply this patch
15) In the OPAC tab, refresh
    -- 245$a (Title) will be hidden.
16) In the staff client, navigate back to
    'Advanced constraints' and check 'OPAC'
17) Click 'Save changes'
18) In the OPAC tab, refresh
    -- 245$a (Title) will be visible again.
19) Run koha qa tools

Signed-off-by: Aleisha <aleishaamohia@hotmail.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d827bb50d9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 14:03:23 +01:00
Owen Leonard 53cebcb07d Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.

To test:

1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
   modal is triggered showing the correct data.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Modal looks much better. Works as advertised

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 23c7de2bc7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 11:20:13 +01:00
Nicholas van Oudtshoorn 9c302d9c09 Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian linux
Adjusts the modulePath to search in the well-known location for 64 bit
systems. Required for at least Fedora.

Test plan:
Without this patch, doing a zebra reindex on a fedora-based install will
cause errors like this:
15:10:47-01/05 zebraidx(16108) [warn] No such record type: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
With this patch, reindexing should just work.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I have tested this doesn't break on debian/ubuntu systems, someone with
a non debian system will need to test it on that

Signed-off-by: Bob Ewart bob-ewart@bobsown.com
It works on openSUSE Leap 42.1

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Just noting that the debian zebra files already contain much more paths
here.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3d7bb7647d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:51:56 +01:00
Frédéric Demians 2eac97ba65 Bug 15429 UT for _parseletter modifying its parameter
Before/after applying the related patch, do:

   prove -v t/db_dependent/Letters.t

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fd07e3296b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:48:39 +01:00
Marc Véron cc3b2d0590 Bug 15429 - sub _parseletter should not change referenced values
In C4/Letters.pm, sub _parseletter changes values that are passed by
reference. E.g. patron's expiry date can change from iso format to
syspref format, leading to strange behaviour in the calling routines
(see Bug 15423).

This patch makes sub _parseletter work on a copy of the referenced values.

(Submitted to get feedback - is this the way to go?)

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Good solution to real time bomb.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 002a2dcb1f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:48:39 +01:00
Marc Véron 93b204f6b6 Bug 15386: Checkout / patron pages: Hide menu items leading to 404 pages
Some of the menu items on patron / Checkout related pages lead to a 404 page
depending on the permissions. This patch hides them as appropriate.

To test:

- For a staff member A, set permission 'borrowers' only (+ 'catalogue')
- Log in as A
- Search a patron and display details
- Verify that none of the menu items at the left lead to the 404 page

- For a staff member B, set permission 'circulate_remaining_permission'
  only (+ catalogue)
- Log in as B
- Go to Circulation > Checkout, search a patron
- Click menu items at the left, some of them lead to the 404 page
- Verify that none of the menu items at the left lead to the 404 page

- Do the same for a staff member C with both permissions set
- Verify that menu items appear as expected

Signed-off-by: Lucio Moraes <lmoraes@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: I have remove the double if
CAN_user_circulate_circulate_remaining_permissions statement (and group
block into one). And also remove unecessary change ('IF a IF b' instead
of existing 'IF a && b')

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 976d715ac5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:45:35 +01:00
Fridolin Somers 638a6343f6 Bug 15252 - Add tests
Tested 4 patches together, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f0da781368)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:41:16 +01:00
Fridolin Somers db50ac5b8c Bug 15252 - Patron search on start with does not work with several terms
When searching a patron, search type can be 'start with' and 'contain'.
If the search text contains a space (or a coma), this text is splitted into several terms.

Actually, the search on 'start with' with several terms never returns a result.

It is because the search composes an "AND" SQL query on terms.
For example (I display only the surname part) :
search type = contain :
  'jean paul' => surname like '%jean% AND %paul%'
search type = start with :
  'jean paul' => surname like 'jean% AND paul%'
The query for 'start with' is impossible.

I propose, for search with start with, to not split terms :
  jean paul => surname like 'jean paul%'

One can always use '*' to add more truncation :
  jea* pau* => surname like 'jea% pau%'

This bug affects a lot surnames with several terms like 'LE GUELEC' or 'MAC BETH'.

Note that the patch moves :
  $searchmember =~ s/,/ /g;
It removes the test "if $searchmember" because $searchmember is tested and set to empty string previously :
    unless ( $searchmember ) {
        $searchmember = $dt_params->{sSearch} // '';
    }

Test plan :
==========
- Create two patrons with firstname "Jean Paul"
- Go to Patrons module
- Choose "Starts with" in "Search type" filter
- Perform a search on "Jean Paul"
=> without patch : you get no result
=> with this patch : you get the two results
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you do not get results for search on "Jea Paul"
- Choose "Contains" in "Search type" filter
- Check you get the two results for search on "Jean Paul"
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you get the two results for search on "Jea Paul"
- Check you get the two results for search on "Paul Jean"

Signed-off-by: Alex <alexklbuckley@gmail.com>

Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>

Bug 15252 - Patron search on start with does not work with several terms - followup 1

'start_with' is the default value of $searchtype, it can be explicit.

Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>

Bug 15252 - correct UT searchtype value is contain and not contains

Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a4f5564c85)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:41:16 +01:00