Commit graph

8807 commits

Author SHA1 Message Date
d63d0a6bb5 Bug 15469: Fix authority header search
Introduced by bug 15381.

The logs contain plenty of "detail.pl: No method value!" and the
dropwdown list is not correctly populated (no value for options)

Test plan:
Go to the authority module and have a look at the auth type codes
dropdown list.
Without this patch, the values of the options are empty.
With this patch, the values are correctly filled.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  I confirm this patch silence noise in log file.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-01-14 17:02:49 +00:00
5c110a394d Bug 15294: Koha::Libraries - Rewrite the admin scripts
This patch rewrites the admin/branches.pl script to use the new modules
instead of C4::Branches.

Test plan:
1/ Create libraries using all the fields available
2/ Create groups of libraries
3/ Assign 1+ libraries to some groups
4/ Delete libraries and groups of libraries
You should not able to delete a library if items or patrons use it.
You should not able to delete a group of libraries if there are still
libraries using it.
5/ Update libraries and groups of libraries

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

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2016-01-14 15:22:26 +00:00
e706cd18f0 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
2016-01-12 16:13:41 +00:00
6233c34484 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
2016-01-12 16:05:14 +00:00
Lyon3 Team
d4c5bce132 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
2016-01-12 15:37:26 +00:00
b6ded94433 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>
2016-01-07 18:54:34 +00:00
47e6df5fe4 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>
2016-01-07 18:32:55 +00:00
eed2c0d437 Bug 15443 - Re-code RESERVESLIP as HOLD_SLIP
It's a bit confusing to have RESERVESLIP named "Hold Slip", we should
finish the job and recode the slip.

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Try printing a hold slip, you should note no difference
   from pre-patch behavior

Followed test plan. The slip is triggered if you want to check out
an item that is reserved / on hold for another patron. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2016-01-04 12:49:30 +00:00
Charles Farmer
1db97e29c7 Bug 10076 - Add Bcc syspref for ClaimAcquisition and ClaimIssues
There is already a syspref called "OverdueNoticeBcc" for sending Bcc
copies of mails sent for overdues and other notices. This patch add a
new syspref ClaimsBccCopy to bcc the claimacquisition and clamissues
alerts.

Changed the wording of the system preference to:

[Send|Don't send] blind copy (BCC) to logged in user when sending
serial or acquisitions claims notices.

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 Gallagher brendan@bywatersolutions.com
2015-12-31 20:28:59 +00:00
603e98646e Bug 14131: Reduce the greybox height to 400px
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 20:24:59 +00:00
Liz
e168a9ccf6 Bug 14131 - Adding print patron cards to patron lists home page
To test:

Go to /cgi-bin/koha/patron-lists/lists.pl
Make a patron list
Click "Print patron cards"
Success: you get a pdf of cards to print.
Failure: you can't get a pdf of cards to print.

Note that you'll need to have a card layout, template, and printer profile defined. The defaults should work.

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

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 20:24:58 +00:00
Marc Véron
5b35435d35 Bug 14131 - Patroncard: Add possibility to print from patron lists
This patch adds the possibility to print patron cards from patron lists.

To test:

- Go to Home > Tools > Patron card creator
- Prepare a patron card and create some cards using the batch functionality
- Apply patch
- Prepare a patron list e.g. from patron search
- Go to Home > Tools > Patron card creator > Manage batches
- Below the list of batches you have a dropdown to select a patron list
- Select your list and hit "Export from patron list"
- Select template and layout as you would do with batches
- Hit "Export"
- Download PDF

Modified patch to work with Bug 14676 changes. Functionality unchanged.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Liz <wizzyrea@gmail.com>

(Amended to make it apply on current master)

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 20:24:58 +00:00
ecd89d2030 Bug 14945 - Add the ability to store the last patron to return an item
Currently if the AnonymousPatron system preference is in use, all patron
data is anonymized. Some libraries would like to be able to see the last
patron who returned out an item ( in case of damage ) but still keep all
other patrons anonymized.

* Add the table items_last_borrower ( id, itemnumber, borrowernumber )
* Add new system preference StoreLastBorrower
* If StoreLastBorrower is enabled, upon checkin have Koha insert into
  this table the patron who last returned this item. Replace existing
  row based on itemnumber if exists.
* If table has a row for a given item, link to the patron from the item
  details page.

Test plan:
1) Apply patch
2) Run updatedatabase.pl
3) Enable StoreLastBorrower
4) Issue an item to a patron and return said item
5) Issue the same item to a second patron, do not return it.
6) View moredetail.pl for the given bib, find the given item. There
   should be a new field in the history list 'Last returned by' with a link
   to the last patron to return the item.

Optionally, you can also verify this works even if patron issuing
history has been set to anonymize issues upon return.

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Jen DeMuth <JDeMuth@roseville.ca.us>
Signed-off-by: Tom Misilo <misilot@fit.edu>

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 19:32:20 +00:00
b2ae720fec Bug 14889: Fix error msg on duplicate
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 19:04:45 +00:00
Katrin Fischer
e17b835804 Bug 14889: QA Follow-up
- Removes unused package from BiblioFramework.pm
- Makes framework table sortable
- Some small changes in wording of error messages

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 19:04:45 +00:00
ba2f667c3c Bug 14889: Use Koha::BiblioFramework[s] in admin/biblio_framework.pl
Test plan:
Add/edit/remove biblio frameworks from the administration module
(admin/biblio_framework.pl).
You should get message feedback after each action.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No problems found. Tested add/edit/delete
No koha-qa errors

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

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 19:04:45 +00:00
7283069a9d Bug 15381: Remove getauthtypes and getauthtype
These 2 subroutines are now not necessary anymore, we can use
Koha::Authority::Types to retrieve the authority types.

This patch won't be easy to test. Indeed, a lot of file are updated.
To test it I would suggest to focus on the merge authority

You should also confirm that the authtypecode and the authtypetext
values are correctly displayed when navigating in the authority module.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 18:59:02 +00:00
5fc9a42c7c Bug 15380: Use Koha::Authority::Type[s] in admin script
This path rewrites the admin/authtypes.pl script to use the new modules
instead of executing the SQL queries from the script.

Test plan:
1/ Create 1+ authority types
2/ Update one
3/ Delete it
4/ Create an authority record using this authority type.
5/ Try to delete the authority type
Here there is a change in the behavior.
Prior to this patch, the user was able to delete the authority type, now
it's not.
I think it was a bug, feel free to give your opinion if you disagree on
this change.

Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
2015-12-31 18:50:41 +00:00
df2bab8f61 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
2015-12-31 18:11:21 +00:00
7ab9d7d91d 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
2015-12-31 18:11:21 +00:00
d3184fa85b 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
2015-12-31 18:11:21 +00:00
Katrin Fischer
29b605eb1e Bug 10154: QA follow-up - Spelling and terminology
- Changing capitalization: Any Patron category > Any patron category
- Changing Collection code > Collection

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 16:16:10 +00:00
Eivin Giske Skaaren
cf529864ce Bug 10154 Add Call number in the filter of most circulated items
This patch adds call number, collection code and shelving location to
the filter.

To test:

It is of course a prerequisite to have items in the DB with the correct
MARC fields and that they have been checked out etc. to get a valid
result when testing.

1. Apply patch to koha synced to master.
2. Go to /cgi-bin/koha/reports/cat_issues_top.pl
3. Select filters, the new ones are Call number, Collection code and
   Shelving location
4. Hit submit.

Expected result:
The filters chosen will be printed under "Filtered on".
A table with the result is shown.

For manual verification here is some SQL to run:

SELECT DISTINCT biblio.title, COUNT(biblio.biblionumber) AS RANK, biblio.biblionumber AS ID, itemcallnumber as CALLNUM, ccode as CCODE, location as LOC FROM `old_issues`
                  LEFT JOIN items USING(itemnumber)
                  LEFT JOIN biblio USING(biblionumber)
                  LEFT JOIN biblioitems USING(biblionumber)
                  LEFT JOIN borrowers USING(borrowernumber)
                  WHERE 1 AND biblioitems.itemtype like 'BK' AND itemcallnumber like '005.2/762' AND ccode like 'NFIC' AND location like 'CART' AND borrowers.categorycode like 'PT' group by biblio.biblionumber order by RANK DESC;

Put in your valid values in the WHERE clause for the values in the
single quotes ''.

Sponsored-by: Halland county library

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  It works as described. Valid results, tested in various combinations.
  Follows the coding (awful) style of the original script, without
  introducing any regression. It would have been great to have
  callnumber interval, but anyway...

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 16:16:10 +00:00
7b8d8a860b Bug 13592 [QA Followup] - Make the system preference description self documenting
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:59:05 +00:00
06e372d0be Bug 13592: Add an option to charge for any hold placed
Currently the fee is applied on if all items for the record are issued
and at least one hold already exists on the record.
This patch does not give a complete answer to the problem (see
discussion on bug 13592 for the other user's expectations).
It only adds the ability to charge for any hold placed regardless of the
conditions.

Test plan:
1) Execute the updatedb entry to insert the new pref
2) Confirm that the behavior is the same as before applying this patch
3) Change the HoldFeeMode pref to 'always'
4) Note that the fee is applied for any hold placed

Signed-off-by: Sally Healey <sally.healey@cheshiresharedservices.gov.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:59:05 +00:00
c678525b47 Bug 15321: No need to add the change trigger conditionally
It will be applied if the button exists.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:44:29 +00:00
Magnus Enger
404a11a9a5 Bug 15321 - Add delete report link to Show, Edit and Run screens
Currently, if you are editing or viewing the results of running a
report and you decide you want to delete it, you have to go back
to the list of saved reports to do so. This patch adds a "Delete"
link in some convenient places.

To test:
- Apply the patch
- Make sure you have at least one saved report
- Make sure you have the create_reports permission
- Go to the Show, Edit and Run screens and verify the Delete link
  is present and functional, including the JavaScript confirmation
  dialogue
- Change to a user without the create_reports permission and check
  that the Delete link is not displayed on the Show, Edit and Run
  screens
- Sign ye off merrily!

Version 2: This version makes sure the JavaScript confirmation is
shown before an actual delete is carried out.

Signed-off-by: Heather Braum <hbraum@nekls.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:44:29 +00:00
c42de7460b Bug 9129 - Add the ability to set the maximum fine for an item to its replacement price
This patch adds the ability to set the maximum fine for a given item to
its replacement price ( assuming the replacement price is set ). If
overduefinescap is also set, the fine will be the lesser of the two, if
both apply to the given overdue checkout.

To enable this new limit, create or edit your circulation rules and
check the checkbox for "Cap fines at replacement price"

Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Pick an item, and set it's replacement price to 3.99
4) Edit the circulation rule that would apply to this item
   and the patron you will check it out to.
5) Check out the item to the patron, and backdate the due date
   such that the fine generated would be more than 3.99
6) Enable CalculateFinesOnReturn
7) Return the item, and view the fine generated, it should be 3.99

Signed-off-by: Cindy Murdock Ames <cmurdock@ccfls.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:29:36 +00:00
Martin Persson
7d3772503c Bug 12342: Patron registration datepicker dropdown shows only 10 years
This patch changes the options to the date picker, allowing easy
selection of dates up to 120 years from the current date.

To test:
- Click on 'Patrons' from the main menu, select 'New patron'
- Set input focus to the 'Date of birth' input field,
  the date selection widget should show up.
- The year selection drop-down will only show current year minus 10.
- Apply the patch
- Go back to the same screen, set input focus to the 'Date of birth' field.
- The year selection drop-down should show current year minus 120.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 15:04:59 +00:00
Liz Rea
090cd49f17 Bug 15211: Patron card creator needs tools sidebar
The patron card creator should have the Tools area sidebar on its pages. This patch adds it.

To test:
Go to More -> Tools -> Patron card creator

The home page should have the tools sidebar
Click through all of the "New" pages - they should all have the tools sidebar
Click through all of the "Manage" pages - they should all have the tools sidebar

Also verify that on each page, the Patron card creator link in the sidebar is bolded

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sidebar displayed Ok. No errors

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 14:58:58 +00:00
Liz Rea
c62bb1aeb7 Bug 15211: adding Tools section sidebar to label creator
The label creator had a very sad sidebar, it needed to have the Tools area sidebar on it.

To test:

Click through all "New" pages, verify that the sidebar appears
Click through all "Manage" pages, verify that the sidebar appears.

Also verify that "Label creator" is bolded in the toolbar while the label creator is active.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sidebar displayed Ok. No errors

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 14:58:58 +00:00
19e3e89df8 Bug 13931 [QA Followup] - Fix whitespace error
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 13:40:29 +00:00
dad848a0a7 Bug 13931 - Date of birth in patron search result and in autocomplete
Test plan:
1) Apply the patch
2) Type into search form patron's name & check his date of birth in
   autocompletion
3) Go to intranet/cgi-bin/koha/members/member.pl & submit
   a search with more than one result .. now should in the table appear
   patron's date of birth
4) Try show/hide columns section if it works correctly for date of birth
5) Go to intranet/cgi-bin/koha/admin/columns_settings.pl -> go to
   patrons section & check there is dateofbirth & it's functionality

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Works as described. Syspref dateformat respected. Column dateofbirth
  configurable, but mandatory on autocompletion search result.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 13:40:29 +00:00
678df3132f Bug 11622 [QA Followup] - Display payment messages directly on opac account view
Fixed spelling of "Receive" in preferences.

Signed-off-by: David Kuhn <techservspec@gmail.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 13:28:01 +00:00
85c5efa0c7 Bug 11622 - Add ability to pay fees and fines from OPAC via PayPal
This patch adds the ability for a logged in user to pay fines and
fees from the OPAC via PayPal.

Test Plan:
 1) Apply this patch
 2) Create a paypal developer account
 3) Create two test accounts, a Personal account and a Business account
 4) Enable PayPal in Sandbox mode via the system preferences.
 5) Enter the business account API credentials into the new system
    preferences.
 6) Create a new patron, add some fines/fees
 7) Log in as that patron in the OPAC
 8) Choose to pay via PayPal, log in as the sandbox Personal account
 9) Complete the transaction
10) Note the fee is now paid

Signed-off-by: Carol Corrales <ccorrales@losgatosca.gov>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
2015-12-31 13:27:14 +00:00
bec70466d5 Bug 9303 [QA Followup] - Remove extra 'USE Koha', change "Call number" back to "Call no."
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 13:08:11 +00:00
3ebf343af6 Bug 9303 [3] - relative's checkouts in the opac
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-31 13:08:06 +00:00
Marc Véron
ff9d241239 Bug 7143: Add link to www.openhub.net profile for Marc Veron
This patch adds a link to www.openhub.net/p/koha/contributors/6618545408147
for Marc Veron (with &eacute;).

(Amended for &eacute; in commit message)

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

(Amended for comment #281: changed second occurence)

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
2015-12-30 16:55:23 -07:00
Nicole C. Engard
8a02409d18 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>
2015-12-30 16:51:38 -07:00
4a584d528d Bug 13517 - Show waiting date on reserve/request.pl
The holds table should show the waiting date for a hold in s similar
manner to the way it does on catalogue/detail.pl In addition, if the
ReservesMaxPickUpDelay syspref is set, we should display the date
when the waiting hold expires.

Test Plan:
1) Apply this patch
2) Set ReservesMaxPickUpDelay to 7
3) Find a waiting hold
4) Browse to reserve/request.pl for that record
5) Notice the "Item waiting" message now has "since <waitingdate>"
6) Notice the expiration field now has the date of <waitingdate> + 7 days

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

Signed-off-by: Cathi Wiggins <CWIGGINS@ci.arcadia.ca.us>

Signed-off-by: Megan Wianecki <mwianecki@mplmain.mtpl.org>

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
2015-12-30 16:42:42 -07:00
Magnus Enger
bd4a683052 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>
2015-12-30 23:39:57 +00:00
e863f6645e Bug 15049: Simplify code in aqplan.tt
There was no need to duplicate this code in the template.
The only change with before this patch is that the "Currency = CUR"
and "Each cell contain both actual and estimated values." are now
displayed on 2 lines instead of 1.

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 23:34:34 +00:00
Marc Véron
0bfd512759 Bug 15049: (followup) Add warning about "No active currency"
Fix translatibiity issues and use include in admin/aqplan.tt as well.
See comment #24

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 23:34:34 +00:00
Bernardo Gonzalez Kriegel
4587d898dc Bug 15049: (Signed off) Hide currency but preserv alert
This follow up hides currency, but the alert pops
if no currency is active.

To test:
1) Apply the patch
2) Unset any active currency
3) Alert must show on Acquisitons home
4) Set a currency active, no currency display on Acqui home
5) Check that currency IS displayed on /cgi-bin/koha/admin/aqbudgets.pl
or /cgi-bin/koha/admin/aqbudgetperiods.pl

Amended for better translation

Currency does / does not display as described in test plan.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 23:34:33 +00:00
Marc Véron
9d2e268739 Bug 15049: Add warning about "No active currency" to Acquisitions start page
If no active currency is defined, Acquisitions does not work properly and software
can occur while receiving.
This patch adds the warning message about missing active currency to Home > Acquisitions

To test:
- Apply patch
- Go to Home > Administration > Currencies & Exchange Rates > Currencies
- Make sure that no active currency is set
- Go to Home > Acquisitions
- Verify that a warning displays:
  - If user has at least permission for parameters_remaining_perissions,
    the warning should display a link to Currencies and exchange rates (currency.pl)
  - If the user has no permission to edit the Currencies and exchange rates,
    no link is displayed.
- Set an active currency
- Veryfy that the warning no longer displays

(Amended to remove superfluous line / mv)

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

Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 23:34:33 +00:00
Aleisha
8255e2ec1f Bug 10468: (followup) fix indentation
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
2015-12-30 16:11:43 -07:00
Aleisha
d46f180b2e Bug 10468: Adding holds table to summary print
To test:
1) Add a hold to a patron
2) Go to patron page
3) Click Print Summary
4) Confirm that 'Pending Holds' table displays with correct information under appropriate headings (should be Title, Author, Placed on (reserve date), Expires on (expiration date), and Pick up library)

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

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

Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
2015-12-30 16:11:19 -07:00
Mirko Tietgen
4e61aa5ef5 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>
2015-12-30 20:41:36 +00:00
Katrin Fischer
3f68107b10 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>
2015-12-30 19:13:29 +00:00
Marc Véron
a85fd85545 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>
2015-12-30 19:08:24 +00:00