Commit Graph

24952 Commits

Author SHA1 Message Date
Nick 77bd7557fa Bug 15210 - Novelist throws an error if no ISBN
This patch makes opac-detail.tt check for an ISBN before attempting to load Novelist content and prevents a js error which breaks other code.

To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function() {$("body").css("background-color","pink");});
3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error in the console
5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 65c5fa4385)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:15:15 +01:00
Jonathan Druart 3073d25f03 Bug 15324: Do not display 'Waiting holds:" if no holds are waiting
Test plan:
- Make sure that you have a patron A with waiting holds and a patron B
  without waiting holds
- Go to the checkout page for patron A (Home > Circulation > Checkouts
> ...)
- At the right, there is a title "Waiting holds:" and a list of
  holds waiting
- Go to the checkout page for patron B
=> Without this patch "Waiting holds:" is displayed

Sign-off on Jonathan's patch
Signed-off-by: Marc Véron <veron@veron.ch>

http://bugs.koha-community.org/show_bug.cgi?id=14324

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit cd46c5dc75)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 10:06:06 +01:00
Kyle M Hall 14ee2557da Bug 15442 - Checkouts table will not display due to javascript error
Uncaught ReferenceError: AllowCirculate is not defined

Test Plan:
1) Go to circulation.pl for a patron, note the checkouts table
   does not load
2) Apply this patch
3) Reload the page, checkouts table should show

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c7339799ff)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:47:28 +01:00
Kyle M Hall c993e45a26 Bug 15289 [QA Followup] - Fix minor language issue
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 8814330439)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:43:32 +01:00
Alex Arnaud 4635b255ab Bug 15289 - borrowers permission allows to see patron's loans
Test plan:

 - log with a user that have "borrowers" permission but not "Remaining circulation permissions"
 - go to a borrower's detail page (who has at least a loan) and click on "show checkouts"
 - check that you see loan(s) and that you can't renew and checkin

 - Do the same with a borrower that have "Remaining circulation permissions"
 - check that you see loan(s) and that you can renew and checkin

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 A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit eb5fca30aa)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:43:28 +01:00
Jonathan Druart d5fd02e4a1 Bug 15332: Sent DateTime object to DBIx::Class, not formatted dates
If formatted dates are sent to DBIx::Class on update/insert, the date
will be set as 0000-00-00 (except if the format is yyyy-mm-dd).

Test plan:
Use the batch patron modification tools to update the dateenrolled or
dateexpiry values for at least 1 patron.
Without this patch, the modified value will be updated to 0000-00-00,
with this patch, the correct value will be set.

Signed-off-by: Nick Clemens <nick@bywatersolutions.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 af7fb9cd48)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:33:08 +01:00
Colin Campbell 141f30d406 Bug 15217 Remove redundant duplicate var declaration
remove superfluous second declaration of template, borrowernumber and
cookie which are never used

Also removed the variables @results and @results_array which are
declared but not used

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  As suggested by Colin, perl -wc catalogue/search.pl doesn't complain
  anymore after applying the patch. perlcritic confirms the 2 variables
  were unused.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 558f291465)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:29:02 +01:00
Hector Castro 008e3805ff 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>
2015-12-31 09:23:10 +01:00
Katrin Fischer 1d8865245a Bug 15228: Patron card batches - Improve translatability
This patch removes the \n\n from a translatable string
as those don't translate correctly to new lines.

It also switches 'item' for 'patron' to avoid confusion
with catalog items.

To test:
1) Trigger changed error message
- Create a new batch with 1 patron entry
- Select patron in list using the checkbox
- Click 'Remove selected patrons' in toolbar
- Verify alert displays correctly

2) Verify that the page no longer uses "items" but
   patrons instead.

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 5782da035f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-31 09:23:05 +01:00
Jonathan Druart 87ce8e85ec 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>
2015-12-30 17:29:53 +01:00
Katrin Fischer 30bfb13466 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>
2015-12-30 17:29:46 +01:00
Jonathan Druart b1e931f7bb 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>
2015-12-30 17:27:52 +01:00
Katrin Fischer 110ba7140b Bug 15229: Fix tiny typos in error messages of batch checkout page
Patch fixes some small spelling errors on the batch checkouts
page. Also switches 'reserves' to 'holds'.

To test:
- Read the patch and verify that the changes are correct.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Changes are correct, patch fixes capitalization and typo

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 59e2b4e105)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-30 17:27:46 +01:00
Katrin Fischer c5fc968f2b Bug 15224: Label creator - fix tiny typo 'itemnunber'
To test:
- Go to Tools > Label creator > New > Label batch
- Check text displayed in grey next to the text input
  field

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 d9c78c9a65)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-30 17:26:49 +01:00
Nicole C. Engard a55557afc0 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>
2015-12-30 17:26:12 +01:00
Marc Véron 8a7bd3aa36 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>
2015-12-30 17:25:23 +01:00
Marc Véron 53f4b7241c 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>
2015-12-30 17:24:33 +01:00
Marc Véron ae929c5283 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>
2015-12-30 17:23:26 +01:00
Marc Véron 722b953d0c 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>
2015-12-30 17:21:50 +01:00
Marc Véron e10046a351 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>
2015-12-30 17:21:37 +01:00
Marc Véron 0be1d64482 Bug 15232: Advanced Cataloging Editor: Fix translation issues
This patch makes
koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc to comply with
Coding guidlines to avoid translation issues: "JS3: Avoid strings which
mix text and markup Text mustn't contain HTML tags."

To test:
- Apply patch
- Verify that code changes are correct (html markup moved out of
  function _(...) )
- Bonus test: Enable syspref 'EnableAdvancedCatalogingEditor' and verify
  that it works as before

With type fix from: Hector Castro <hector.hecaxmmx@gmail.com>

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: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 36c0658329)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-30 17:19:08 +01:00
Marc Véron 78f47f5dc8 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>
2015-12-30 17:17:10 +01:00
Marc Véron d1e8b93f66 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>
2015-12-30 17:17:05 +01:00
Marc Véron d8aa61c574 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>
2015-12-30 17:07:18 +01:00
Marc Véron c7028a02b5 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>
2015-12-30 17:06:31 +01:00
Marc Véron 0eff941b1b 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>
2015-12-30 17:05:45 +01:00
Marc Véron 88d1dfcfff 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>
2015-12-30 17:04:54 +01:00
Marc Véron 40724deeb8 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>
2015-12-30 17:03:19 +01:00
Marc Véron 3e1c6e5cf9 Bug 15361: Translatability: Fix issue on Administration Columns settings
This patch rewords the following sentence that is not correctly translatable due to
splitting b tags:
Changes made below will only apply to item subfields that are mapped to the items table.

To test:
- Apply patch
- Verify that the rewording makes sese and that no sentences are split by tags.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording message 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 4983d5c4b9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-30 17:01:53 +01:00
Marc Véron ec2e2f6d0b 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>
2015-12-30 16:59:39 +01:00
Marc Véron 3951a8fffd 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>
2015-12-30 16:58:31 +01:00
Nicole C. Engard 4d3ba8c178 Bug 14638: Update Serials Help
The serials help file was out of date for 3.18+

To test:

* apply patch
* Go to serials > new subscription
* Click help
* Confirm help correct

Signed-off-by: Aleisha <aleishaamohia@hotmail.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 3f6a1d47fd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-30 16:53:34 +01:00
Julian Maurice cbf245a962 Increment version for 3.22.1 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-25 00:21:21 +01:00
Bernardo Gonzalez Kriegel 9f039cc7ad Translation updates for Koha 3.22.1 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-25 00:21:03 +01:00
Julian Maurice 8dfe6fd2ee Update release notes for 3.22.1 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-25 00:20:47 +01:00
Liz Rea 34d60046f9 Bug 15223 - fix buttons on patron lists
To test:
go to tools -> patron lists
notice that the buttons are not misaligned anymore

You may need to force refresh the page to see the original issue, and to see it fixed.

With patch buttons display nicely.
Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dba72d903d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-14 09:24:46 +01:00
Marc Véron 24048cbfe7 Bug 15230: Remove unused file circ/stats.pl and stats.tt from system
This patch removes stats.pl and stats.tt from system.

To test:
- Verify that both files are not used and that the only reference in
  koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt
  is commented out.
- Apply patch
- Verify that the files are deleted and the reference is removed.
- git grep 'stats.pl', verify that there are no more references to
  this file.

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
See the following commit for more info on this script:
  commit 60105bd692
  Date:   Tue Jul 8 20:02:34 2008 -0500
    fix for 2008: Daily reconciliation report broken

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 186b4b7e09)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-14 08:42:56 +01:00
Kyle M Hall fddc423c09 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>
2015-12-14 08:39:43 +01:00
Fridolin Somers bff51cb38c 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>
2015-12-14 08:31:27 +01:00
Bernardo Gonzalez Kriegel f6d9e04b88 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>
2015-12-14 08:28:19 +01:00
Katrin Fischer ccdc2288a6 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>
2015-12-14 08:24:51 +01:00
Blou 6012bc8b99 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>
2015-12-14 08:21:28 +01:00
Julian Maurice 23837e1c13 Bug 15325: Fix --table option of rebuild_zebra.pl
Option's value given on command line was never used and 'biblioitems'
was used instead.

Test plan:
1. git checkout master
2. perl misc/migration_tools/rebuild_zebra.pl -b -t items --where "price = 42"
3. You should see errors printed on screen about an unknown column
4. Apply patch
5. perl misc/migration_tools/rebuild_zebra.pl -b -t items --where "price = 42"
6. No errors \o/

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 48df0b8a2d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2015-12-14 08:18:10 +01:00
Marc Véron dfa650949d 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>
2015-12-14 08:16:30 +01:00
Katrin Fischer 552a9d066e 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>
2015-12-14 08:12:09 +01:00
Katrin Fischer efeeffb064 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>
2015-12-14 08:12:09 +01:00
Bernardo Gonzalez Kriegel 14dc51472a 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>
2015-12-11 17:34:59 +01:00
Katrin Fischer 0fba468262 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>
2015-12-11 17:30:42 +01:00
Fridolin Somers 3f9d68e599 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>
2015-12-11 17:14:35 +01:00
Katrin Fischer df1a9a98fd 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>
2015-12-11 17:10:15 +01:00