Commit graph

7310 commits

Author SHA1 Message Date
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
65d3203525 Bug 15409 - Plugins section missing from Admin menu sidebar
The sidebar menu in the Admin area of Koha is missing a section for
Plugins.

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

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 18:03:30 +00:00
dbae2bdf2f Bug 15099 [QA Followup] - Make bug pass koha-qa.pl
Cleaned up additional tab characters and such well. This is a very
good time to take care of these.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 16:49:16 +00:00
a2293ff6f5 Bug 15099: Move admin/categorie.pl to admin/categories.pl
This patch fixes the filename categorie.pl correcting it by categories.pl
The plurial is usually used for script names in the admin module.

Test plan:
Navigate to the patron categories page.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  No reference to categorie.pl anywhere in the code

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 16:36:41 +00:00
Aleisha
5df49b04ef Bug 15373: More changes of Zip to ZIP on intranet
To test:

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 16:30:35 +00:00
Aleisha
3da8abcfef Bug 15373: Changing Zip to ZIP on OPAC and Intranet
To test:

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 16:30:35 +00:00
826326064e Bug 9819 - 'stopwords'-related code removed
This patch removes code related to stopwords usage. The following methods are removed:

C4::Search->remove_stopwords
C4::Context->stopwords
C4::Context->_new_stopwords

And the buildQuery API was changed (removed the \@removed_stopwords return value).
A follow-up is provided for database changes, to make rebasing easier.

To test:
- Apply this patch
- Do some searches in both intranet and opac interfaces
- Nothing should break

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 15:49:35 +00:00
60960b85fd Bug 15317 - Use Bootstrap modal for MARC and Card preview when ordering from staged files
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the page in Acquisitions for ordering from a staged
file so that the "MARC" and "Card" previews display in Bootstrap modals.

To test:

1. Apply the patch and navigate to Acquisitions.
2. Locate an exsiting basket or create a new one.
3. Add to the basket using the option to order from a staged file.
4. Click "Add orders" from any staged file.
5. Test the "MARC" and "Card" links for multiple results and confirm
   that the correct data is shown each time.

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>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 15:31:27 +00:00
b6cf96dbfe Bug 15316 - Use Bootstrap modal for authority Z39.50 search results preview
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the authorities Z39.50 search results page so that
MARC previews are displayed in Bootstrap modals. This patch also
modifies the authorities toolbar include file to make the Z39.50 search
popup size match that in cataloging.

Because the modal is triggered from a pop-up window, the modal has been
reformated to exclude the footer and reduce the size of the modal
header.

To test:

1. Apply the patch and navigate to Authorities.
2. Click the "New from Z39.50" button to open the search
   window.
3. Perform any search which will return multiple results.
4. Test the visible "MARC" link for multiple results and
   confirm that the correct data is shown each time.
5. Click anywhere in the results table to show the hidden menu and test
   the "MARC" link it displays.

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>
2015-12-30 15:25:46 +00:00
c0e6b9b14a Bug 15320 - Use Bootstrap modal for MARC preview when ordering from an existing record
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the page in Acquisitions for ordering from an
existing record so that the "View MARC" preview is displayed in
Bootstrap modals.

To test:

1. Apply the patch and navigate to Acquisitions.
2. Locate an exsiting basket or create a new one.
3. Add to the basket using the option to search for an existing
   record.
4. Perform any search which will return results.
5. Test the "View MARC" link for multiple results and confirm
   that the correct data is shown each time.

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>
2015-12-30 15:17:50 +00:00
94547432f4 Bug 15318 - Use Bootstrap modal for MARC and Card preview when ordering an external source
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the page in Acquisitions for ordering from an
external source so that the "MARC" and "Card" previews display in
Bootstrap modals.

This patch also fixes a bug where the in-table popup menu points to the
wrong record (fixed in Cataloging by Bug 6367).

To test:

1. Apply the patch and navigate to Acquisitions.
2. Locate an exsiting basket or create a new one.
3. Add to the basket using the option to order from an external source..
4. Perform a search which will return multiple results.
5. Test the "MARC" and "Card" links for multiple results and confirm
   that the correct data is shown each time.
6. Click anywhere in the results table to show the hidden menu and test
   the "MARC" and "Card" links it displays, confirming that the data
   looks correct and corresponds correctly to the title you selected.

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>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 15:10:13 +00:00
c7339799ff 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>
2015-12-30 15:07:40 +00:00
Katrin Fischer
3706997188 Bug 8085: Rename 'Reserve slip' to 'Hold slip'
This patch changes all occurrences of 'Reserve slip'
to 'Hold slip' in the sample notices files and
in one of the system preferences.

To test:
- Make sure the sample_notices.sql are correctly
  changed.
- Verify the description of the SlipCSS system
  preference has been changed correctly.

Checked the working in system preferences and re-loaded notices from the
updated English sample notices SQL. Changes look correct.

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>
2015-12-30 14:53:50 +00:00
67aeb17bfb Bug 15319: Move marcPreview modal div to avoid duplication
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Good catch Jonathan, thank you.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 14:47:51 +00:00
4a0deff529 Bug 15319 - Use Bootstrap modal for MARC preview when performing batch record modifications
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones.

This patch modifies the batch record modification page so that the
"Preview MARC" link triggers a preview in a Bootstrap modal.

To test:

1. Apply the patch and navigate to Tools -> Batch record modification.
2. Submit multiple biblionumbers for batch modification.
3. In the results list, click the "Preview MARC" link for multiple
   results and confirm that the correct data is shown each time.
4. Use the "Modify record using the following template" menu to change
   the modification template.
5. Confirm that the "Preview MARC" links still work and show data
   correctly modified by your newly chosen template.
6. Repeat steps 2-5 with authority record numbers.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Works as described. No regression.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 14:47:51 +00:00
23c7de2bc7 Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.

To test:

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 14:37:32 +00:00
Marc Véron
976d715ac5 Bug 15386: Checkout / patron pages: Hide menu items leading to 404 pages
Some of the menu items on patron / Checkout related pages lead to a 404 page
depending on the permissions. This patch hides them as appropriate.

To test:

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

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

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

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 13:10:10 +00:00
dcc10787cc Bug 15309 - Use Bootstrap modal for cataloging search MARC and Card preview
In order to reduce the number of dependencies for common interactions we
should attempt to use Bootstrap modals in place of Greybox ones. This
patch modifies the cataloging search results page so that "MARC" and
"Card" previews are displayed in Bootstrap modals.

To test:

1. Apply the patch and navigate to Cataloging.
2. Perform a search which will return results from the catalog.
3. Test the "MARC" and "Card" links for multiple results and confirm
   that the correct data is shown each time.
4. Perform a search which will return results from the reservoir.
5. Test the corresonding "MARC" and "Card" links for those results.

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>
2015-12-30 12:51:16 +00:00
2d0d717301 Bug 14636: Item search - biblioitems column is publicationyear not publicationdate
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow-up!

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 12:44:26 +00:00
Katrin Fischer
2aa6518c8a Bug 14636: Item search - improving display
- Changes "Publication Date" to "Publication date"
  in the CSV export
- Fixes 'no JavaScript fallback' display to match
  the normal display
  - only show 'by' when it's UNIMARC and an author
    exist
  - show copyrightdate if publicationyear is empty

To test:
- Turn of Javascript in your browser before you
  item search. This will activate the alternative
  display.
- For MARC21:
  - Verify that the author displays when existing
    and no 'by' is shown.
  - Verify that the publication date is now shown.
- For UNIMARC:
  - Verify that 'by' only displays when there is
    an author to display.
  - Verify that the publication date is still
    shown.
- Try the CSV export.
- Verify that the CSV header now reads 'Publication date'.

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

Successfully tested non-JS behavior and CSV export. DID NOT test
UNIMARC.

Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 12:44:26 +00:00
ac541e0fa1 Bug 15344: Remove unucessary call to GetMemberDetails
This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.

To test this patch you should have technical skills to know what to do.

Note that USER_INFO was an array of... 1 element. Now it's a hashref.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:53:18 +00:00
940010b2bd Bug 11747 - Add system preference DefaultToLoggedInLibraryOverdueTriggers
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: INSERT IGNORE INTO + msg

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:47:41 +00:00
Jonathan Druart
10480c406c Bug 11625: Implement DefaultToLoggedInLibraryNoticesSlips
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:41:14 +00:00
651ba2bac3 Bug 11625 - Add system preferences DefaultToLoggedInLibraryCircRules and DefaultToLoggedInLibraryNoticesSlips
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: INSERT IGNORE INTO + msg

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
2015-12-30 11:41:13 +00:00
Gaetan Boisson
4d96477544 BUG 14991 Improve consistency of authority search
At the moment we can search authorities from two places: authorities-home.pl and auth_finder.pl (while cataloguing).

The auth_finder.pl page offers searching specifically in the $a of the main heading, while the authorities home page doesn't.

Additionally, the wording and order of the options is different.

authorities-home.pl has:
Search main heading
Search all headings
Keyword search

while auth_finder.pl has:
Main entry ($a only)
Main entry
Anywhere
Heading match

This patch will add some consistency so that both pages offer:
Search main heading ($a only)
Search main heading
Search all headings
Search entire record

Test plan:

- apply patch
- go to authorities home
- check that previous searches are still working
- check that the new ($a only) search is working
- go to auth finder (from cataloguing)
- check that searches are still working
- check that we do have the same wording in both pages and that forms are now consistent

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>
2015-12-30 04:29:04 +00:00
Marc Véron
1acc6094be Bug 14948 - Display amounts right aligned in tables on patron pages
This patch set display amounts for charge, fine, price etc. right aligned in tables
on patron pages.

To test, apply patch and verify that amounts appear right aligned on following pages:

- Go to Home > Patrons, perform a search (Column 'Fines')
- Go to a patron with fines and credits
  - Checkout tab (circulation.pl): Columns 'Charge', 'Fine', 'Price'
    (maybe you have to show column with 'Show / hide colums')
  - Fines Tab > Pay fines (pay.pl): Columns 'Amount', 'Amount Outstanding'
  - Fines Tab > Account (boraccount.pl): Columns 'Amount', 'Outstanding'
    Note: Test here 'Filter paid transactions' as well

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 04:25:51 +00:00
Hector Castro
7d16555427 Bug 15170 - Add 264 field to MARC21*DC.xsl
Modify MARC21*DC.xsl to add RDA 264 field

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

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

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

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

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

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
2015-12-30 03:49:27 +00:00