Commit Graph

26758 Commits

Author SHA1 Message Date
Owen Leonard 3beadbcfed Bug 16566 [Revised] 'Print slip' button formatting inconsistent
This patch modifies the style of some "print slip" links on the checkin
page to make them consistent with other buttons shown in dialogs.

This patch also removes the use of "onclick" in some places in favor of
defining events in the JavaScript.

To test apply the patch and go to Circulation -> Check in.

- Check in an item which belongs at another branch. You should see a
  dialog which asks the user to transfer the item. Confirm that the
  "Print slip" button looks correct and works correctly.

- Check in the same item again. You should see a different dialog which
  has both a "Print transfer slip" and "Cancel transfer" button. The
  "Print transfer slip" button should look correct and work correctly.

- Check in an item which is part of a rotating collection. (Or, if Bug
  16570 is still open, check in any item) You should see a dialog which
  notifies you that the item is part of a rotating collection. The
  "Print slip" button in this dialog should look correct and work
  correctly.

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

Revision following QA: Removed redundant class attribute from the print
button tested in step 1.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e29de9967b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:13:08 +02:00
Aleisha 87e05ac546 Bug 16324: Move item search into header
This patch makes the Search button in the header into a dropdown that holds the Advanced search and the Item search.
I have rewritten this patch to be independent of Bug 16323 since that patch is so controversial.

To test:
1) Confirm that Advanced search and Item search are both under the 'Search' dropdown menu in the header and both links work as expected

Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Note that the CAN_user_catalogue test is useless. If a librarian does
not have it, (s)he cannot access to the staff interface.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90b3241fb8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:12:06 +02:00
Julian Maurice 2590cb8258 Bug 16271: Allow more filters on /api/v1/holds
borrowernumber parameter is no longer required and you can filter on
every column of reserves table

Some example requests
- GET /api/v1/holds
- GET /api/v1/holds?biblionumber=123
- GET /api/v1/holds?borrowernumber=456
- GET /api/v1/holds?priority=0&found=W

Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 975be0aef0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:11:13 +02:00
Hector Castro f6c5e5c16a Bug 15172: (follow-up)Serial enumchron/sequence not visible when returning/checking in Items
Display br and span tag only if the value enumchron exists.

To test
-Apply patches
-Follow the previous test plan
-Checkin whichever material (e.g., book) without sequence or enumchrom
-Open up source code for checkin page, search under title and
verify that b and span tags do not appear

Signed-off-by: Alain et Aurélie <aurelie.berut@enssib.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 74ce643b89)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:10:41 +02:00
Olli-Antti Kivilahti 7138630232 Bug 15172: Serial enumchron/sequence not visible when returning/checking in Items
Displays the items.enumchron-column in returns.pl when checking in Items.

Rewording commit

To test:
-Checkout a barcode for serial with items generated in
Serials >  New subscription or item in DB with items.enumchron-column
-Checkin the same barcode, the table Checked-in items will appear without
information about "Publications details (Vol. 400, No. 32)"
-Apply patch
-Checkout and checkin another item of the same serial title
-Notice about the Vol. 400, No. 32 below the serial title.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
items.enumchron-column display successful in returns.pl (Home>Circulation>
Check in)
NOTE: Patch rebased on master

Signed-off-by: Alain et Aurélie <aurelie.berut@enssib.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 1d6c235add)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:10:16 +02:00
Kyle M Hall 9f0f7cbb05 Bug 14790 [QA Followup] - Don't show links unless OPACBaseURL is set
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e68f620188)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:05:05 +02:00
Kyle M Hall 26323c7a9c Bug 14790 - Add OPAC view link to Serials detail
Test Plan:
1) Apply this patch
2) Browse to subscription-detail.pl for a given serial
3) Note the new "OPAC view" link
4) Click the link, a new tab should open up showing the record
   details for that record in the OPAC

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 600786e7f1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:04:51 +02:00
Kyle M Hall 333ba71714 Bug 14790 - Add OPAC view link to items editor
Test Plan:
1) Apply this patch
2) Find a record and open the items editor for it
3) Click the "Actions" button for an item
4) Choose the option "OPAC view"
5) A new browser tab should open to the OPAC details page for the record
   whose items you are editing.

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 1fcdef312b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:04:38 +02:00
Kyle M Hall 2e114ef061 Bug 14790 - Add Opac view link to search results
Test Plan:
1) Apply this patch
2) Perform a staff catalog search
3) Note the new "OPAC view" link
4) Click the link, it should open a new tab to the OPAC details for that
   record.

This works fine except that it doesn't open in a new tab. I don't think
it's the fault of the patch, but of browser.js messing with links again
(See Bug 11937).

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 2cc6e67204)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:04:28 +02:00
Marc Véron 1ff6cd4236 Bug 10760: (followup) Move street type after address
As of comment #7

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9e1542eb84)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:02:04 +02:00
Marc Véron 22af71d8af Bug 10760: Alternate Address: Display street number and street type
This patch displays alternate streetnumber and street type on patron's
detail page.

To test:
- Apply patch
- Verify that the alternate address information displays follwing the
  setting in syspref AddressFormat and contains street type and
  street number (as appropriate)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 03795b65d5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:01:53 +02:00
Marc Véron 193c4af3e0 Bug 10760: Alternate Address: Make street number and street type editable
Table 'borrowers' contain columns B_streetnumber and B_streettype.
This patch makes them editable for alternate address.

To test:
- Apply patch
- Edit a patron's details
- Verify that in edit mode for Alternate address, the fields 'street type' and 'street number' appear
  and follow the settings in sysprefs AddressFormat, BorrowerMandatoryField, BorrowerUnwantedField
- Verify that the values are saved correctly.

Note: A second patch will follow to manage the display of street number and street type
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3e576f65b2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 11:01:21 +02:00
Jonathan Druart 363d8bcbb8 Bug 9259: Use is instead of is_deeply
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit df57c8e864)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:59:55 +02:00
Aleisha 3e6e92ad66 Bug 9259: Ability to delete a staged file once it has been cleaned
To test:
1) Go to Tools -> Staged MARC Management and clean a file. If you have no files to clean, go to 'Stage MARC for import' and upload one to clean following the necessary steps.
2) Confirm that once the file has been cleaned, the Action column now shows a Delete button. Confirm this button only shows for cleaned files.
3) Click the Delete button.
4) Confirm that clicking Cancel exits the pop-up message and does not delete the file.
5) Confirm that clicking OK refreshes the list of staged records and the one you just deleted is no longer on it (has been deleted). You can confirm this by checking for the file in mysql (SELECT * FROM import_batches WHERE import_batch_id = X;)
6) Run prove -v t/db_dependent/ImportBatch.t (have written unit tests for CleanBatch and DeleteBatch)

Sponsored-by: Catalyst IT
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Catalyst sign off, so needs another one but YAY this is great.

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 08e448ee4b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:59:18 +02:00
Jonathan Druart ee7af309a6 Bug 16860: Remove the comment about the warning
It is no longer necessary.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c19f342bb1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:50:08 +02:00
Mark Tompsett 756f75a044 Bug 16860: Catch warning t/db_dependent/ClassSource.t
$ prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 3/24 attempting to use non-existent class sorting routine routine1
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24,  1 wallclock secs ( 0.02 usr  0.00 sys +  0.66 cusr  0.02 csys =  0.70 CPU)
Result: PASS

The above warning might be scary to those unfamiliar with the test.
Add a test to catch the warning.

TEST PLAN
---------
1) prove t/db_dependent/ClassSource.t
   -- as above
2) apply patch
3) prove t/db_dependent/ClassSource.t
   -- no message
4) prove -v t/db_dependent/ClassSource.t
   -- test 13 is the new test
5) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Workas 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 b80318f1b7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:49:54 +02:00
Jonathan Druart 6a7fd3ecdc Bug 16857: Check on item.branches makes more sense
The test should be on the existence of the item.branches
method/attribute

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f38bcf5505)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:48:53 +02:00
Marc Véron dc6ea8d5c9 Bug 16857 - patron-attr-types.tt: Get rid of warnings "Argument "" isn't numeric"
To vrify:
- Go to Home > Administration > Patron attribute types
- Make sure you have some patron attribute types with no branches limitation
- For each attribute type you get a warning in intranet-error.log:
patron-attr-types.pl: Argument "" isn't numeric in numeric gt (>) at (...)/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt line 284.

To test:
- Appy patch
- Verify that warnings no longer appear in intranet-error.log

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit abb7980004)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:48:17 +02:00
Magnus Enger 3f3c78865a Bug 16823 - Comment out koha-rebuild-zebra in koha-common.cron.d
Bug 16190 enabled the indexer daemon by default for package installations.
This means that it is no longer necessary to set up koha-rebuild-zebra as
a cron job. This patch comments it out, so that people who might run into
bug 16814 can easily activate the cronjob again after de-activating the
indexer daemon.

To test:
Just read the diff and check that it makes sense.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 666397446f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:58 +02:00
Hector Castro 1d29e0488c Bug 16803: Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
Add Font Awesome Icons to "Select/Clear all" links to shelves.tt
(Public and private lists)

To test:
-Apply patch
-Go to More -> Lists
-Create some Public and Private Lists
-See the contents of the list and notice about the new icons in
 "Select/Clear  all"

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 3c80818f68)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:20 +02:00
Marc Véron ecc37f0f57 Bug 16795 - Patron categories: Accept integers only for enrolment period and age limits
To test:
- Apply patch
- Clear browser cache
- Go to Home > Administration > Patron categories
- Create or edit a category
- Verify that field 'In months', 'Age required' and 'Upperage limit'
  accept digits only

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e3002eea20)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:47:03 +02:00
Jonathan Druart aa680d86dd Bug 16794: Group the 2 action buttons into the same column
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9b399a8061)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:46:33 +02:00
Hector Castro de9b8b1cd1 Bug 16794: Revise layout for Admistration > Patron categories
Add Bootstrap buttons and Font Awesome Icons to "Delete" and "Edit" links

To test
- Go to Administration -> Patron categories
 - Confirm that two button appear instead of links for "Edit" and "Delete"
 - Edit an existing category and confirm that works as expected
 - Delete a category and confirm that works properly.

Patch fix it according with QA comment 3
Fix copy and paste according with QA comment 6
Fix column "Default privacy" to be sorted again according with comment 8
Patch set squashed

Buttons appear now as requested in comment #3 (2 buttons, no action menu)

Re-tested, 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 a50eb52a42)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:46:10 +02:00
Hector Castro 80d4fef0c5 Bug 16781: Add Font Awesome Icons to "Select/Clear all" links to modborrows.tt and result.tt
Add Font Awesome Icons to "Select/Clear all" links to:
modborrows.tt (Batch patron modification) and result.tt (Search results)

To test:

-Apply on top bugs 16469 and 16494
-Goto Batch patron modification
-Create a new batch patron or select one patron list
-See the new icons for "Select all" and "Clear all"
-Do a search and see the new icons in Search results page

Followed test plan, icons display as expected
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>
(cherry picked from commit 68c0c94b94)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:45:39 +02:00
Hector Castro ad4ceadaf4 Bug 16793: Use Font Awesome for arrows instead of images in audio_alerts.tt
This changes fit with bug 16148 for marc modification template management

To test
-Apply patch
-Goto Admin->Audio alerts
-Verify that green arrows have disappeared now
 in blue Awesome Icons

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

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

https://bugs.koha-community.org/show_bug.cgi?id=16794

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 90da601783)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:45:25 +02:00
Marc Véron a6c80d1a0f Bug 16779: Move road type after address in US style address formatting (main address)
To verify:
- Create a patron with address, streettype, streetnumber defined
- Set syspref 'AddressFormat' to US style
- Go to patron's detail page (in staff client)
- In main address, road type preceeds address (e.g. 25 Drive Euclid)

To test:
- Apply patch
- Refrexh patron's detail page
- Verify that main address displays correctly (e.g. 25 Euclid Drive)

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 eb77861750)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:44:58 +02:00
Claire Gravely ac83809da7 Bug 15929 - typo in explanation for MaxSearchResultsItemsPerRecordStatusCheck
There's a typo in the explanation for the new
MaxSearchResultsItemsPerRecordStatusCheck  sys pref that was added in 3.22.2.

"If a record has more than this number of items, they availability statuses
..."

I have re-worded the description so it reads a bit better.

Test plan:
1. Check the description for syspref MaxSearchResultsItemsPerRecordStatusCheck.
2. Apply patch
3. Check syspref MaxSearchResultsItemsPerRecordStatusCheck description
 to make sure it makes sense.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cae7e29cf2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:44:14 +02:00
Mark Tompsett 5129b29b02 Bug 16869: Silence and catch warnings in t/db_dependent/SuggestionEngine_ExplodedTerms.t
By properly defining a opachtdocs (intranethtdocs was done too)
in the mock function, uninitialized variable warnings are
eliminated. Given that we can check if $KOHA_CONF is defined or
not, we can catch the warning as part of testing, so the output
of the test is cleaner.

TEST PLAN
---------
1) unset KOHA_CONF
2) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- lots of noise
3) apply patch
4) prove t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- no noise
5) prove -v t/db_dependent/SuggestionEngine_ExplodedTerms.t
   -- see the warnings were caught and not just ignored.
6) run koha qa test tools

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5ec641fbbb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:57 +02:00
Marc Véron 6f5b5a2cb0 Bug 16562 - Translatability: Issue in opac-user.tt (separated word 'item')
Alternate patch with wording as proposed in comment #12

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5f147cc6bb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:19 +02:00
Nick Clemens 66250c1df6 Bug 16807 - Use Koha::BiblioFrameworks instead of GetFrameWorkLoop
Refactor code to use work from 14889

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 10d4d2fd31)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:43:05 +02:00
Nick Clemens 9c4576cb93 Bug 16807: Frameworks unordered in dropdown when adding/editing a biblio
To test:
Start to add or edit a biblio
Open the dropdown to change framework
Notice the order
Refresh the page - notice the order changes
Apply patch
Order is alphabetical
Refresh the page
Order does not change

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d17085ea03)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:42:46 +02:00
Marc Véron 82bbaf5212 Bug 16774: Format date on 'Transfers to receive' page to dateformat system preference
To test:
- Apply patch
- Go to Home > Circulation > Transfers to receive
- Verify that in title (Transfer made to your library as of...) is
  is formatted as defined in syspref dateformat

Additionaly, the patch changes page title and breadcrumb from:
Home > Circulation > Transfers to your library
to:
Home > Circulation > Transfers to receive
...to make them consistent with the link text on the Circulation home page
   (Transfers to receive)

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 11dc97cfae)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:42:08 +02:00
Owen Leonard f07737744a Bug 16600 - Remove some obsolete references to Greybox in some templates
This patch removes unused Greybox markup from two templates.

To test, apply the patch and go to Authorities.

- Perform an authority search which will return multiple results.
- Select two records to merge.
- On the "merging records" page, an earlier version used Greybox to show
  a preview of the selected authority records. Confirm that authority
  number link for the two records triggers a pop-up window instead.

- From the authorities home page, choose 'New from Z39.50'
- Perform a search which will return multiple results.
- Confirm that there is only a 'MARC' preview link. A
  forever-commented-out 'Card' link has been removed.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Obsolete comment on 'Card' removed

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b6ccd8366d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:41:35 +02:00
Bouzid Fergani 57a727afa5 Bug 15636 - DataTables Warning: Requested unknown parameter from opac-detail.tt
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This patch adds the same tests in the aoColumns DT definition than the
ones in the creation of the table. That's sound good.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a12d3d1bfa)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:41:13 +02:00
Marcel de Rooy 58de933e03 Bug 16859: Fix wrong item field name in export.pl
Field callnumber should be itemcallnumber.
For completeness, prefixing the joined fields with items table prefix.

Note: You should expect Tools/Export to export only the items within a
given itemcallnumber range, but if the biblio has one item in that
range, the biblionumber is selected for export with ALL items. The script
is designed that way (first select biblio numbers based on criteria, and
run export with those biblio numbers).

Test plan:
[1] Select a biblio N with one item with say itemcallnumber X.
[2] Goto Tools/Export. Select biblio range N,N and no itemcallnumber
    range. The biblio should be exported.
[3] Select biblio range N,N and itemcallnumber range A,B. No output.
[4] Select biblio range N,N and itemcallnumber range A,<empty>. Output.
[5] Select biblio range N,N and itemcallnumber range <empty>,X. Output.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 00960f1964)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:40:45 +02:00
Nick Clemens 0b40c96d2d Bug 16855 - Poor performance due to high overhead of SQL call in export.pl
This patch eliminates all columns retrieved in the biblioitems query
except for biblionumber.

To test:
1 - Go to tools->Export data
2 - Export using various filters and note you get expected records
3 - Apply patch
4 - Ensure exported results match results before patch

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a44bb07b88)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:40:14 +02:00
Marc Véron e9840ac795 Bug 16854: request.tt: Logic to display messages broken
This patch fixes broken logic in
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt

To verify, see initial comment.

To test:
- Apply patch
- Have a patron with a restricion and with outstanding fines
  greater than defined in syspref 'maxoutstanding'
- Place a hold for this patron and verify, that messages
  'Patron has restrictions' and 'Patron has outstanding fines...'
  appear

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 44092cbafd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:39:40 +02:00
Kyle M Hall e0b29cea2a Bug 16780 - Specify due date always sets time as AM when using 12 hour time format
This regression is occurs because the time format for the checkout
date/time widget is only meant to be given in 24 hour format. The time
due should not be converted to 12 hr time even if the library has 12
hour set as their preferred time format.

Test Plan:
1) Performat a backdated checkout with a date due that has a PM time
2) Note the date/time picker on the confirmition screen shows the time
   in AM/PM
2) Note the time is not stored correctly
3) Apply this patch
4) Repeate step 1
5) Note the confirmation date/time picker now show the time in 24hr
   format
6) Note the time was stored correctly

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7c89f78f3b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:39:00 +02:00
Owen Leonard 071ce5aa26 Bug 16762: Record matching rules: Remove match check link removes too much
My patch for Bug 5006 introduced a lot of markup changes to the record
matching rules template. I missed a change in one are though, which
caused a bug with the way the 'Remove match check' link works.

To reproduce:

- Go to Administration -> Record matching rules.
- Edit a matching rule which includes at least one match check.
- Click a 'Remove match check' link. The entire "Required match checks"
  block is removed.

To test, apply the patch and repeat the steps above. Clicking any
'Remove match check' link should remove only the corresponding rule.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ffcb360321)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:38:36 +02:00
Galen Charlton 01b0fe1aa8 Bug 16760: fix Circulation Statistics wizard under Plack
This patch fixes some variable scoping problems when running
the circulation statistics wizard under Plack.  For example,
when using the item type as a row header, with this patch the
item type description is displayed rather than "UKNOWN VALUE".

This patch also enables warnings and fixes a couple variable
initialization issues. (Note that turning on warnings across
the board would make it easier to identify Plack variable scoping
issues, as "Variable "$foo" is not available at' errors would
be recorded in the Plack error log).

To test
-------
[1] Run the staff interface under Plack.
[2] Go to the Circulation Statistics Wizard and run a report
    using item type as the row. Note that the row labels
    display as "UNKNOWN VALUE" rather than the item type.
[3] Apply the patch and restart Plack.
[4] Run step #2 again; this time, the item type descriptions should
    be used as the row labels.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
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 8ca55a7fb3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:35 +02:00
Marcel de Rooy c575ed3f20 Bug 16671: [QA Follow-up] Replace remaining itemtype lines
Instead of relying on existing data, we use new TestBuilder recs.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c7596a4894)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:17 +02:00
Marcel de Rooy 71e73f5a44 Bug 16671: [QA Follow-up] Add new itemtype and remove bailout
No need to bail out, if we are using TestBuilder.
Somehow, this test passes with me if we add a new record, and if
we do not, it fails (using BK as the first itemtype with notforloan
is 0).

Looking further, we should imo remove the Koha::ItemTypes searches
here and not depend on existing data. Just add some item types.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eddc0a0e0a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:37:05 +02:00
Jonathan Druart 4b2804dce1 Bug 16671: (bug 14828 follow-up) Pick the right itemtypes
Looking at commit aafe73eefb
  Bug 14828: Use Koha::ItemType[s] everywhere C4::ItemType was used
-my @item_types = C4::ItemType->all;
-my @for_loan = grep { $_->{notforloan} == 0 } @item_types
-  or BAIL_OUT("No adequate itemtype");
-my $itemtype = $for_loan[0]->{itemtype};
+my $itemtype = Koha::ItemTypes->search({ notforloan => 1 })->next;
+$itemtype or BAIL_OUT("No adequate itemtype"); #FIXME Should be $itemtype = $itemtype->itemtype

It seems that the tests expect itemtypes for loan.

Test plan:
  prove t/db_dependent/HoldsQueue.t
should still return green

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. No qa test tool errors

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8f42c681b0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:36:42 +02:00
Jonathan Druart 7c68f51d13 Bug 16459: Add patron to a patron card requires catalogue permission
Currently, serials => 'routing' is required, which does not make any
sense.
It's a copy/paste error when this file has been created (you can blame
me).

Note that I am not sure catalogue is the correct permission, but it's
the one used almost everywhere in this module

Test plan:
Confirm that catalogue is enough to search for patrons to add to a
patron card.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3bb51d0386)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:35:22 +02:00
Jonathan Druart 39838698a1 Bug 16431: Use Koha::Cache to cache marc subfield structure
The marc subfield structure is currently cached using a global variable
of C4::Context. The infos are retrieved every time a new context is
created.
This patch suggests to use Koha::Cache instead.

To achieve this goal, a new subroutine is created
C4::Biblio::GetMarcSubfieldStructure, it will be called from code which
needs to get the marc subfield structure. GetMarcFromKohaField,
GetMarcSubfieldStructureFromKohaField, TransformKohaToMarc and
_get_inverted_marc_field_map are modified accordingly and the cache is cleared
when the table is updated (from the 3 pl scripts modified by this patch).

The caching done in C4::Context (marcfromkohafield) is removed.

Test plan:
Play with the marc subfield structure (in the administration module),
then add and edit records and make sure everything went fine.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Everything works as expected on my functional tests. I'm really happy to see the
patch introduces relevant tests for previously untested functions.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 172ebfe520)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:34:57 +02:00
Alex Arnaud ca08a21e4e Bug 14968 - Provides unit test
Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.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 1509322c9a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:33:02 +02:00
Lyon3 Team 3bed66a3e2 Bug 14968 - found shouldn't be set to null when cancelling holds
Signed-off-by: JM Broust <jean-manuel.broust@univ-lyon2.fr>

Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.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 83328c1061)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:32:51 +02:00
Morgane Alonso 17156342e6 Bug 12509 - Fix Untranslatable Restriction added by overdues process
Changes the value of the "comment" column in "borrower_debarments" table
from "Restriction added by overdues process yyyy-mm-dd hh:mm:ss" to
"OVERDUE_PROCESS yyyy-mm-dd hh:mm:ss" in the overdue_notices.pl. Then in
the templates "moremember.tt", "circulation.tt", "memberentrygen.tt",
"opac-reserve.tt" and "opac-user.tt" the value of "comment" is
check, if it's an automatical comment due to overdue process it'll
write "Restriction added by overdues process yyyy-mm-dd hh:mm:ss",
then if there is a customizable comment it will be written without
modification. Like this, the comment "Restriction added by overdues
process" is written in the po files and can be translated later.

To test:
1) create a patron with automatical restriction due to overdue process;
2) apply patch;
3) run misc/cronjobs/overdue_notices.pl;
4) verify if the comment "Restriction added by overdues process" is well
   written and translatable on the following page :
    - opac patron home page (opac-user.tt);
    - opac item reservation page (opac-reserve.tt);
    - pro patron page (moremember.tt);
    - reservation item for a patron (circulation.tt, memberentrygen.tt);
5) try to translate the comment in po files;
6) sign off.

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a1285ba9c0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:32:21 +02:00
Marc Véron 79744a3989 Bug 16772 - Change label from 'For:' to 'Library:' to ease translation
This patch changes the label from "For:" to "Library:" in the
acquisition information filter on the suggestions page in staff client.

To test:
- Apply patch
- Go to Home > Acquisitions > Suggestions management
- Verify that label reads as appropriate (in filter
  Acquisition information)

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 4747e6155e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:21:09 +02:00
Jonathan Druart 927498a007 Bug 16770: Remove 2 other occurrences of libmemoize-memcached-perl
Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 735789d71a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
2016-08-01 10:20:51 +02:00