Commit Graph

24055 Commits

Author SHA1 Message Date
Hector Castro deef37d65e Bug 15228: Switch "Items in batch number"
Yet another line to switch "Items in batch number" to
"Patrons in batch number"

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit e89714ea84)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 008e3805ff)
2015-12-31 17:53:00 +01:00
Jonathan Druart 33137f4bdd Bug 15101: Correct typo AllowPkiAuth vs AllowPKIAuth
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit d36280e36e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 87ce8e85ec)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:51:13 +01:00
Katrin Fischer 9aec475b05 Bug 15101: Don't display sys pref AllowPkiAuth under CAS heading
The system preference AllowPkiAuth display under the heading
CAS authentication, but is actually a separate authentication
option. Patch creates a separate heading for it.

To test:
- Go to Administration > System preferences > Tab Administration
- Verify that AllowPkiAuth is now displayed separately

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit cee796629f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 30bfb13466)
2015-12-31 17:50:17 +01:00
Jonathan Druart 90e1ee89cd Bug 15229: Same fix for circulation.tt template (normal checkouts)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit acf586a45a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit b1e931f7bb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:43:33 +01:00
Nicole C. Engard a6c630aec6 Bug 15220: Fix typo in circ rules help
MaxFinesystem should be MaxFine system

To test:

* visit circ & fine rules
* click help
* confirm typo fixed

Signed-off-by: Thomas Misilo <misilot@fit.edu>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 391c8ec0bc)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a55557afc0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:41:14 +01:00
Marc Véron 0447edf9e3 Bug 15238: Better translatability for Installer Step 1
This Bug streamlines html in installer/step1.tt for better translatibility.

To test:
Reviwe code and verify that changes in text make sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
To reproduce in Debian environment, remove a required module with
dpkg -r. Rewording Ok for translation purposes

Bug 15238: (followup) Remove word 'Note:'

'Note: ' removed as requested in comment #3

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Word 'Note' removed

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 29a4300c07)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8a7bd3aa36)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:40:44 +01:00
Marc Véron e372febf1e Bug 15237: Quote of the day: Better translatibility for editor and help
This patch moves  html markup out of explanatory text in Quote of the day editor and help
for better translatibility (Home > Tools > Quote Editor).

To test:
- Apply patch
- Go to Home > Tools > Quote Editor and related Help
- Verify that text changes make sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Make consistent space after "Note:" (inside the br tag)

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b0e833f9f5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 53f4b7241c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:40:12 +01:00
Marc Véron 0eab9d32bd Bug 15236: Better translatibility in "Connect biblio.biblionumber to a MARC subfield"
This patch moves html markup out of explanatory sentence in koha2marclinks.tt ("Connect
biblio.biblionumber to a MARC subfield") for better translatability.

To test:

- Apply patch
- Go to Home > Administration < Koha to MARC mapping
  and edit a tag
- Verify that text change makes sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f9586b0199)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ae929c5283)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:39:48 +01:00
Marc Véron 6119522047 Bug 15233: (followup) Remove 2 sentences.
This patch removes 2 sentences (see comment #8)

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8f77dc86ce)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 722b953d0c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:39:16 +01:00
Marc Véron 0bf604f023 Bug 15233: Cataloging subfield editors: Clean up html and streamline text for better translatability
This patch removes bold markup from explanatory text in auth_subfields_structure.tt
and makes it the same as in marc_subfields_structure.tt for better translatibility.

To test:
- Apply patch
- Verify that string changes make sense and that the explanatory text is the same in both files.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 9b0d9a186a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit e10046a351)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:38:55 +01:00
Marc Véron 42315be031 Bug 15231: (followup) Remove stray </b> tag
This patch removes a stray </b> tag (see comment #4) and a superfluous blank.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ea0d5aa6bf)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 78f47f5dc8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:36:45 +01:00
Marc Véron a2c9af33a4 Bug 15231 - Import patrons: Remove string splitting by html tags to avoid weird translations
Some of the strings in Home > Tools > Import patrons contain html tags and therefore are
splitted in the translation tool. This makes it nearly impossible to create correct translations
from the partial strings.
Additinally, the notes for Extended patron attributes never displayed (due to a bug).

To test:
- Apply patch
- Enable Syspref 'ExtendedPAtronAttributes'
- Go to Home > Tools > Import patrons and verify, that the Notes at the right of the
  screen make sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Split html tags removed, notes at right side it displayed correctly

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 5843c76546)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit d1e8b93f66)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:36:23 +01:00
Marc Véron 99d8a586bb Bug 15300: Translatability: Replace ambiguous 'From' and 'To' in members-update.tt
This patch replaces semantically ambigous words "From" and "To" in
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
for better translatability.

To test:
- Apply patch
- Make sure that patrons can request detail changes in OPAC
  (sysprefs opacuserlogin, OPACPatronDetails)
- Log in to OPAC, request a change of personal details
  (cgi-bin/koha/opac-memberentry.pl)
- Log in to staff client
- Click link 'Patrons requesting modifications' or go to
  Home > Patrons > Update patron records
- Verify that table headers make sense

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purpose

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit b075135269)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit d8aa61c574)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:32:10 +01:00
Marc Véron a62b8a526c Bug 15366 - Fix breadcrumbs and html page title in guided reports
This patch fixes following issues with breadcrumbs and html page title
in Home > Reports > Guided reports wizard:

- Sometimes, breadcrumbs display a stray > at the end

- While creating a report, steps are not displayed in breadcrumbs and
  do not appear in html page title
- html page title is divided by newlines

To test:
- Apply patch
- Go to Home > Reports > Guided reports wizard
- Go to all pages including the steps for creating a new report and
  verify
  - that the breadcrumbs display properly and make sense
  - in html source, the page title makes sense and displays on one line.

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 639ccd469f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit c7028a02b5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:30:38 +01:00
Marc Véron 26fd215629 Bug 15365: Translatability: Fix issue on Administration > Circulation and fine rules
Fix translatability issue on smart-rules.tt to prevent odd translations (Sentences
splitted by tags and newlines).

To test:
- Apply patch
- Go to Administration > Circulation and fine rules
- Verify that the lines "Note: " and "Important: " below "Default holds policy by
  item type" make sense and are not splitted by tags and (in html) by newlines.

(Amended to fix commit message)

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
strong Note and Important displayed Ok for translation purpose

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit bc2e4ba862)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 0eff941b1b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:29:22 +01:00
Marc Véron 519dd29943 Bug 15363: Translatability: Fix issue with ambiguous 'all' on Administration > Set library checkin and transfer policy
In branch_transfer_limits.tt, set ambiguous word 'all' (separated by tags) into a
translatable context.

To test:
Apply patch
- Go to Home > Administration > Set library checkin and transfer policy
- Verify that the word 'all' is no longer separated by tags
  in "For all collection codes: " rsp. "For all item types: "
  (Switch with syspref 'BranchTransfersLimitsType')

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works well for translation purpose

Bug 15363: (followup) Move tags inside if statements

Followup for comment #3

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 27363271be)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 88d1dfcfff)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:28:47 +01:00
Marc Véron 8c404db64e Bug 15362: Translatability: Fix issue on Administration 'Did you mean?'
Fix sentence splitting by tags on didyoumean.tt leading to odd translations.

To test:
- Apply patch
- Go to Home > Administration > Did you mean?
- Verify that the information below the title displays properly and makes sense.
- Disable Javascript, reload page
- Verify that the warning about missing Javascript displays properly and makes sense.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived. Removed em tags for translation purpose

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 984f641417)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 40724deeb8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:28:09 +01:00
Marc Véron 98937fa5bc Bug 15346: Translatability: fix sentence splitting issue in memberentrygen.tt
Fix sentences in memberentrygen.tt that are split by <strong> tags, leading to
wrong capitalization in German (because it can not be decided if a string is part
of a sentence or a standalone sentence).
Example: Es sind Keine Bibliotheken definiert.

To test:
- Apply patch
- To trigger the messages, you have to edit a patron in a system where
  no libraries and no patron categories are defined
- Alternatively, carefully review the changes in
  koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sentences fixed for translation purposes

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 698fb010f5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ec2e2f6d0b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:23:15 +01:00
Marc Véron 4448c38763 Bug 15345: Translatability: fix issue in facets (Availability')
This patch fixes an issue with a splitted sentence in facets (Avalability)
that leads to weird translations e.g.:
German: 'Zeige nur Verfügbar Exemplare'
French: 'Montrer seulement disponible exemplaires'

Additionally, the link "Show all items" gets it's own li tags to display
nicely like the other links in the facets column and it removes superfluous
dots.

To test in OPAC and Staff client:
- Apply patch
- Do a search that results in more than one available items
- In column "Refine your search", click on "Limit to currently available
  items"
- Verify that the message "Showing only available items" and the link
  "Show all items" display nicely.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
use_zebra_facets set to 0 in koha-conf.xml to test. Works as described

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 5e80a64ea3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3951a8fffd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-31 17:22:17 +01:00
Julian Maurice 13239b15a5 Bug 14363: OAI-PMH: Handle records without marcxml
Test plan:

1/ git checkout 3.18.x
2/ GET http://OPAC/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml
3/ Take the first biblionumber from the results ($biblionumber)
4/ mysql> update biblioitems set marcxml=null where biblionumber=$biblionumber
5/ Repeat step 2 => XML error
6/ Apply patch
7/ Repeat step 2 => no errors

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Fix works for 3.18.x and 3.20.x
3.22 is not impacted

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-30 16:39:04 +01:00
Frédéric Demians 77589b549c Track down last 3 failing tests on Jenkins
- Fix t/DateUtils.t

- t/db_dependent/TestBuilder.t

  Upgrade this test verbosity in order to find out on which data source
  it fails on Jenkins.
2015-12-29 16:20:14 +01:00
Frédéric Demians caa2207302 Fix various failing tests on 3.20.x branch
- t/db_dependant/Contract.t
- t/db_dependent/Circulation_issue.t
- t/db_dependent/Holds.t
- t/Auth_with_shibboleth.t
2015-12-29 14:08:40 +01:00
Frédéric Demians 7761e8c5ff Revert "Bug 15171: Display subscriptions which will expire in the future"
This reverts commit 7368075d1e.

Fix test
2015-12-29 10:44:44 +01:00
Tomas Cohen Arazi a90e8e2297 Bug 15431: svc/checkouts dies due to undefined variable (13024 merge problem)
When bug 13024 was merged into 3.20.x, a bug was introduced by replacing the
old way to fetch itemtype descriptions with the newer (3.22+).

To test:
- Perform a checkout on a patron
- Check so all checkouts are shown immediately
=> FAIL: It keeps loading forever. The logs show the svc/checkouts script died
- Apply the patch
- Reload page
=> SUCCESS: It loads the circ information correctly
- Sign off :-D

Regards

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
2015-12-29 10:34:28 +01:00
Frédéric Demians d2fde14375 Fix Koha.pm 3.20.7 version number 2015-12-26 19:49:14 +01:00
Bernardo Gonzalez Kriegel 95a5b0ded0 Translation updates for Koha 3.20 release
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-24 16:20:45 +01:00
Frédéric Demians aa2a182b80 Version 3.20.7
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-24 16:20:04 +01:00
Kyle M Hall 95cea538de Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
When canceling a hold from the holds over tab, you are redirected back to the holds waiting tab. Instead, we should the librarian should continue to see the list of holds past the waiting length.

Test Plan:
1) Apply this patch
2) Cancel a hold from the "Holds over" tab on circ/waitingreserves.pl
3) Note you are redirected back to the holds over tab

Signed-off-by: Tom Misilo <misilot@fit.edu>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 353e30d73e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit fddc423c09)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 18:57:39 +01:00
Fridolin Somers 4b10d5b610 Bug 15193 - Perl scripts missing exec permission
Some perl scripts have 644 permissions instead of 755.

I think some are special like install-CPAN.pl.

This patch corrects some common perl scripts.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.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 3410608b66)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit bff51cb38c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 18:56:53 +01:00
Bernardo Gonzalez Kriegel f2dfce1a95 Bug 14971: fix RIS export
This patch removes a limit in RIS.pm print_isbn sub.

To test:
1) Find in opac a book with an isbn with length(isbn) > 10
(with dashes or isbn13)
2) Export record to RIS format, check truncated SN field
in exported file
3) Apply the patch
4) Export again, no more truncation

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 906d2108b9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit f6d9e04b88)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 18:56:15 +01:00
Katrin Fischer dd466e8320 Bug 15202: Fix date display when transferring an order
The date a basket was created was not displayed
according to the dateformat system preference.

Also fixes wording of the message shown when there
are no baskets for a chosen vendor.

To test:
- Create an order with an order line
- Click on the "Transfer" link on the basket
  summary page
- Search for a vendor without open baskets
- Verify change of message shown:
  "There are no open baskets for this vendor."
- Choose another vendor with open baskets
- Verify the creation date of the basket is
  displayed correctly formatted.

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit f4b8c4ede9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ccdc2288a6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 18:55:37 +01:00
Blou d0636d4800 Bug 14846 - Items with no holdingbranch causes svc/holds to crash
When trying to display the holds for a user, if an item has no
holdingbranch, it causes the svc/holds service to crash and the display
to freeze.

Tentative steps to reproduce on any DB:
1) put 1 or more items on hold for a given user.
2) go into the database and set the item.holdingbranch to NULL
3) In the user's page, in checkouts (circulation.pl), click the tab that
   should be written 1 Hold(s)
4) It will be "Processing" indefinitely.

The cause is the svc/holds code that crashes.  The fix will validate
that there's an holdingbranch before proceding with the code.

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c6f7496422)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 6012bc8b99)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 16:01:46 +01:00
Marc Véron e000b9f0f1 Bug 15244: t/db_dependent/Reserves.t depends on external data/configuration
Test 14 in t/db_dependent/Reserves.t fails if syspref LocalHoldsPriority is
set to "[Give] priority for filling holds to patrons whose...

To verify:
- Set syspref as above and run test. Test 14 fails.
- Set syspref to [Don't give] and run test agein, it passes OK.

To test:
- Apply patch
- Run test again with syspref set / not set
Expected result: In both cases test should pass

(AMended to change bug title)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ae5962cab4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit dfa650949d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 15:56:23 +01:00
Katrin Fischer 09e110b482 Bug 15216: Returns - Show collection description
The table of returns displays the collection code
instead of the description. This patch fixes that.

Same as first patch:

To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items

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 a102ccd48f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 552a9d066e)
2015-12-14 15:37:23 +01:00
Katrin Fischer 7a48270a21 Bug 15216: Returns - Show branch names and item type description
Changes the table with returned items to display the branch
names for home and holding branch and the itemtype description
instead of the codes.

To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items

Signed-off-by: Nick Clemens <nick@bywatersolutions.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 84a0f1acf6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit efeeffb064)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-14 15:37:15 +01:00
Bernardo Gonzalez Kriegel 32bc47f6d4 Bug 11038: Enable use of IntranetUserCSS on staff client login page
This patch enable use of IntranetUserCss on staff client
login page.

To test:
1) Add something to IntranetUserCSS to modify login page,
for example

 #login h1 a {
   height:30px;
 }

2) Logout from staff client, no changes on login page.
3) Apply the patch
4) Reload, now logo is cut in half :)
Bonus) Login again an try changing image, add

 #login h1 {
  background: url(http://example.com/img/other-logo.png) no-repeat top center;
 }

and fix height. Logout and check

This also affects 3.20 and perhaps earlier versions.
Re-upload to fix examples

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 11e4c42e05)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 14dc51472a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Merging issue due to intranetusejs syspref renaming. Fixed.
2015-12-11 18:09:13 +01:00
Katrin Fischer 53eef72a20 Bug 9184: Acq - Don't show authority batches when ordering from staged file
When ordering from a staged file, the list of files
should only include imports of bilbiographic and
no authority data.

To test - start without the patch:
1) Stage an authority file
2) Stage a bilbiographic file
3) Create a new basked in acquisitions
4) Create a new order line selecting "From a staged file"
5) Verify that both files are shown
6) Apply patch
7) Verify that only the bibliographc file shows
   in the list now

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 169015af94)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 0fba468262)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-11 18:02:35 +01:00
Fridolin Somers 800c2df2e3 Bug 14599 - Saved auth login and password are used in patron creation from
If one save the login and password used to authenticate in staff interface,
when creating a new patron, those login and password are filled in the
corresponding inputs in the form.  This behaviour is awkward from web browser.

A trick is provided by
http://stackoverflow.com/questions/10738090/why-firefox-autocomplete-even-with-different-input-name

I found that the best way is to use an hidden disabled input between userid and
password.

Test plan :

- Log into Koha
- Allow the browser to save the userid/password
- Be sure that you have only one userid/password for this Koha
- Loggout
- Re log to check the browser autocomplets the authentication form
- Create a new patron
=> Without patch your saved userid/password have been added to the form
=> With patch your saved userid/password have not been added to the form

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This is not elegant but it works.
Note that the problem does not exist with Chromium

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f4870f6666)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 3f9d68e599)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-11 18:01:20 +01:00
Katrin Fischer 0b7e0b8ab0 Bug 14349: Checkouts and Fines tab missing category description on the left
When navigating the tabs in the patron account, for 2 tabs the
patron category description is missing above the tabs.

To test:
- Go to a patron account in staff
- Click through the tabs
- Verify that for Checkouts and Fines the category description
  is missing above the tabs
- Apply patch
- Verify the description is now shown

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9e518de90f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit df1a9a98fd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-11 17:58:50 +01:00
Hector Castro ef7346872b Bug 15290: (follow-up)SQL reports headers encoding problem
Fix SQL row data and headers enconding problem

To test:
-Apply patches
-Follow previous test plan
-Notice the headers and row data is displayed in UTF-8
 without double encoding
-Save in Comma separated text, Tab seprated text, and Open Document.
-Verify in the three options the file exported is Ok

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4f6bcc5cc9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 8cc6e1170a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-11 17:57:45 +01:00
Tomas Cohen Arazi 8f847dadc8 Bug 15290: SQL reports headers encoding problem
To test:

- Create an SQL report with column names containing UTF characters
- Run the report
=> FAIL: The column names are double encoded
- Export the report
=> FAIL: The column names are double encoded in the exported file
- Apply the patch
- Re-run the report (reload works)
=> SUCCESS: Encoding correct
- Export the report
=> SUCCESS: Encoding correct
- Sign off :-D

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: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 879b1386ff)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 333593c011)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-11 17:57:28 +01:00
Jonathan Druart 217c50382a Bug 12152: Holds to pull report - Display location descriptions
...instead of their code

Test plan:
Same as before, confirm the the location codes are replaced with their
descriptions.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a901ed155a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 0ee6451023)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 14:12:01 +01:00
Katrin Fischer 7e577fe266 Bug 12152: Holds to pull report - Show branch names and item type descriptions
The 'Holds to pull' report shows branch and itemtype codes without
this patch. With the patch, names and descriptions should display.

To test:
- Make sure there are some holds for available items in your system
- Go to Circulation > Holds to pull
- Verify changes mentioned above in the list of holds shown

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works as described, although as Magnus mentioned, Locations
still use codes instead of descriptions.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 0f7f6a5cb3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 773d7e2d1f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 14:09:27 +01:00
Nicholas van Oudtshoorn 6a6d051f91 BUG 11602: [ENH] Fix localcover display
Adds a css class of thumbnail to local covers.
Don't show the 1px "No image found" image
(since we'll ususally try another image provider)

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Box with "No cover image availabe" fixed when syspref OPACLocalCoverImages
set to display

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit a06793dc58)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 24ba596672)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 14:07:25 +01:00
Kyle M Hall 1029f25cf4 Bug 13024 [QA Followup] - Add nonpublic note to relatives' checkouts
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit fc05098469)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 13c4a8e77a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 14:04:33 +01:00
Kyle M Hall 1a49ebf90b Bug 13024 - Nonpublic note not appearing in the staff client
The nonpublic note for items is not displayed in the staff client. It
should be displayed in the following areas:
1) Checkouts (circulation.pl)
2) Checkins (returns.pl)
3) Record details ( moredetail.pl )

Test Plan:
1) Ensure your non-public note field is mapped to the
   items.itemnotes_nonpublic database column
2) Edit an item, add a test nonpublic note
3) Check out the item, verify the note is visible in the checkouts table
4) Check in the item, verify the note is visible in the checkins table
5) View the item details, verify the note is visible and editable
   if your account has the rights to edit items

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 717878982f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit a5b993672f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 14:04:23 +01:00
Katrin Fischer d52ae9be23 Bug 15250: Fix Perl error on acqisition stats page
To test:
- Go to reports -> Acquisitions statistics
- Populate with the following values:

   Acquisitions statistics
      Received on.
         Row:    checked
         Column: checked
         From:   01/01/2015
         To:     Un-selected

    Cell value
       Count items

    Output: To screen into the browser: checked

- Running the report will trigger the following error:

   Software error:
   Can't locate object method "field" via package "aqorders.datereceived" (perhaps you forgot to load "aqorders.datereceived"?) at /usr/share/koha/intranet/cgi-bin/reports/acquisitions_stats.pl line 293.

- Apply the patch and repeat test
- Verify the report now works correctly

Note: Patch was created from notes and suggested
      fix on the bug report, written by Barton Chittenden.

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit d9cef35b75)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit cd693a52b8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 13:52:53 +01:00
Jonathan Druart a6d5c091df Bug 15256: Fix items table display on the detail page
Bug 14966 fixed a bug but introduced another one: With
IndependentBranches set to 'prevent', if the librarian (without the
superlibrarian permission) can edit items but not all, the table is
broken.  DataTables raises the following warning: "DataTables warning:
table id=DataTables_Table_1 - Requested unknown parameter '8' for row0."
And does not display correctly.

Test plan:
1/ Create a biblio record with 1+ items located in different places.
2/ Create/use a patron with the permission to edit items
3/ Set the IndependentBranches pref to 'prevent'
4/ With this patron logged in, go on the record detail page.
Without this patch, the display is broken (only 1 edit link and 1 td
missing, DataTables raises a warning).
With this patch, the display is correct.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  See the warning, and the broken table. Solved by this patch.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d456acc7bf)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit ed13f4fe20)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 13:52:29 +01:00
Jonathan Druart 7747465976 Bug 15270: Add regression tests for Koha::Objects->find
Signed-off-by: Magnus Enger <magnus@libriotech.no>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 07:32:17 +01:00
Jonathan Druart 4f3af04623 Bug 15270: Make Koha::Objects->find return undef instead of crashing
On 3.20.05, if AnonymousPatron is set to a nonexistent borrowernumber, the about.pl crashes with

  DBIC result type  isn't of the type Borrower at /home/koha/src/Koha/Objects.pm line 87.

This was fixed on master by
  commit 6882949b1b
  Date:   Wed Apr 8 06:38:34 2015 -0400
      Bug 13967 - System preferences need a package

Test plan:
Set the AnonymousPatron pref to a nonexistent borrowernumber
Go on about.pl
Without this patch, you get the error.

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Set AnonymousPatron pref to a nonexistent borrowernumber. Before the
patch, about.pl shows a nasty error. After applying the patch the
error is gone. Tests in t/db_dependent/Objects.t pass.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2015-12-07 07:32:03 +01:00