Commit Graph

21586 Commits

Author SHA1 Message Date
Kyle M Hall c20a7cd4df Bug 13290 - Add better feedback for returns to the checkouts table
The feedback given when returning an item is only to update the "Check
in" column. It would be nice if the entire column was highlighted in
some way so librarians have an easier time spotting which items were
checked in and which ones failed to be checked in.

Test Plan:
1) Apply this patch
2) Browse to a patron with checkouts
3) Return an item using the checkouts table
4) Note if the return was successful, the row is highlighted in
   yellow, if the return was not allowed, the row is highlighted
   in red.

Signed-off-by: Christopher Brannon <cbrannon@cdalibary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 9fcdb01082)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2015-01-22 22:36:45 +13:00
Jonathan Druart ebdbf0caab Bug 13408: Tell librarians they may continue scanning while checkouts table is loading
Some librarians do not realize they can continue scanning items even if
the checkouts table has not loaded. We should have Koha tell them
explicitly that they may continue scanning barcodes.

Test Plan:
1) Apply this patch
2) Load the checkouts table on circulation.pl, note the loading message is now
   Loading... you may continue scanning.
3) Load the checkouts table on moremember.pl, note the loading message is still
   Loading...

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

This one works too!

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 28513edb94)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:33:26 +13:00
Kyle M Hall 0e97706b3b Bug 13293 - Regression: Override renewal limit option broken with AJAX circ
The "Override renewal limit" checkbox no longer works to un-hide the
renewal checkboxes in the table of checkouts. I assume this is because
the script works in such a way that it is looking for the checkboxes
before they are part of the document.

Test Plan:
1) Apply this patch
2) Check the "Override renewal limit" checkbox
3) Note the checkbox now appears

Note, this change allows the "X of Y renewals remaining" to be displayed
for non-renewable items. I left this as it is for two reasons: 1) it
gives the librarian more information that may be useful, and 2) it looks
nicer and more uniform.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

I confirm the bug and the solution.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes tests and QA script, works as described.
Exception: on-site checkouts can't be renewed.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:32:10 +13:00
Kyle M Hall 01795f7ed9 Bug 13286 - Checkouts table due date not updated when an item is renewed.
When an item is renewed from the checkouts table, the new due date is
displayed in the renewal column, but the old date due is still displayed
in the due date column. This should be updated as well.

Test Plan:
1) Apply this patch
2) Renew an item from the checkouts table
3) Note the date due is updated in the "Due date" column

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

This works well in my test. My librarians will be grateful for the fix
-- they were complaining about this bug.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2015-01-22 22:25:09 +13:00
Kyle M Hall ffd015964d Bug 13195 - Regression: Circulation checkouts table no longer shows item type description
Another regression caused by Bug 11703: The list of checkouts on the
circulation and patron detail page shows item type codes instead of the
full description.

Test Plan:
1) View a patron's checkouts, note the Item type column displays the
   code rather than the description.
2) Apply this patch
3) Refresh the page, note the description is now displayed

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

Works as described.

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

Works as described, no problems found.
Passes tests and QA script.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:22:59 +13:00
Owen Leonard 205a1db4a4 Bug 13236 - Regression: Table of checkouts no longer preselects overdue items for rewewal
Before Bug 11703, overdue items in the list of a patrons checkouts had
the renewal checkbox preselected so that librarians could quickly renew
only those items which required it. This is not longer the case.

This patch corrects it. To test, apply the patch and clear your browser
cache. Check out to a patron who has overdues and confirm that the
overdue items have the "renew" checkbox preselected. Check that items
which are not overdue are not preselected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:22:00 +13:00
Kyle M Hall 5869bccfc3 Bug 12778 - Regression: Item lost status doesn't show in list of checkouts
When using the longoverdue script it's possible that items marked lost
remain on the patron account. I think it's important for staff to see
that some items are marked lost - currently the list of checkouts
doesn't show any sign of the lost status.

Test Plan:
1) Find a patron with a checked out lost item
2) Note the lost status is not displayed in the checkouts table
3) Apply this patch
4) Refresh the page, note the lost status now displays
5) Repeat this test plan for a damaged item

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with damaged and multiple lost values.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:16:05 +13:00
Owen Leonard 75046946ac Bug 13253 - Unnecessary white space above checkouts table in circulation
On the new checkouts page there is some padding above the checkouts,
relatives' checkouts, and holds tables caused by extra markup in the
table's sDom configuration (http://legacy.datatables.net/ref#sDom):

<'row-fluid'<'span6'><'span6'>r>t<'row-fluid'>t

This creates several empty <div>s which don't serve any purpose. This
patch simplifies it to:

rt

To test, apply the patch, clear your browser cache, and check out to a
patron who has items checked out, holds on their account, and child
records attached which also have checkouts.

The padding above the table of checkouts, the table of relatives'
checkouts, and the table of holds should match that on the sides.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Checked per plan on both Check Out and Details pages, spacing appears correct.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 22:13:34 +13:00
Kyle M Hall 38e69b2956 Bug 13020 - Checkouts table default ordering is incorrect
The checkouts table is no longer keeping "today's checkouts" in the
order they were scanned.

Test Plan:
1) Create 3 records "Test 1", "Test 2" and "Test 3" each with one item
2) Check out the items to a patron in the order "Test 2", "Test 1", "Test 3".
3) Note the order is incorrect.
4) Apply this patch
5) Refresh the page
6) Note the order is now correct

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Note that the bug already exists before bug 12550. I checked on a 3.14.x
branch (without the ajax circ stuff), and the order is the same as with
this patch.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
2015-01-22 21:57:47 +13:00
Mason James 6971b7d532 Reverting back to 'v3.16.06' tag, 1c30985
i've discovered a bit late - a series of patches to fix issues for the 'ajax circ' feature (BZ11703) in 3.16
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11703

specifically, these patches...

730f416 Bug 13537 - Focus should move to barcode after renewing via checkouts table
2d70457 Bug 13290 - Add better feedback for returns to the checkouts table
7477cbc Bug 13408: Tell librarians they may continue scanning while checkouts table is loading
24a749d Bug 13293 - Regression: Override renewal limit option broken with AJAX circ
6e20fdf Bug 13286 - Checkouts table due date not updated when an item is renewed.
13fda83 Bug 13195 - Regression: Circulation checkouts table no longer shows item type description
48db11d Bug 13236 - Regression: Table of checkouts no longer preselects overdue items for rewewal
17e6a8b Bug 12778 - Regression: Item lost status doesn't show in list of checkouts
dd385fc Bug 13253 - Unnecessary white space above checkouts table in circulation
8848e72 Bug 13020 - Checkouts table default ordering is incorrect
d8ed913 Bug 12899: Row grouping in checkouts table is alphabetical and depends on translation
b8fae84 Bug 12729 - Overdue items won't show as overdue in red in circulation

most of these patches don't apply clean, and need to be manually added to 3.16 (which is also risky and fiddly)

because these patches are (imho) the most urgent for 3.16 - i plan to reset the 3.16.x branch back to the 'v3.16.6 tag', then add these corrected patches 1st, before less urgent patches
2015-01-22 20:09:37 +13:00
Mason James b69b2faed6 Revert "Bug 13196 - "Always show checkouts immediately" cookie should persist across sessions"
This reverts commit cb7e1c6066.
2015-01-21 02:59:32 +13:00
Owen Leonard cb7e1c6066 Bug 13196 - "Always show checkouts immediately" cookie should persist across sessions
This patch modifies the way the checkouts script sets the "Always show
checkouts" cookie so that it is set with an explicit expiration date
(+365 days). This will allow the cookie to persist across browser
sesssions.

To test, apply the patch and clear your browser cookies to start with a
clean slate.

- Check out to a patron who has existing checkouts. Their checkouts
  should not load by default.
- Check the "Always show checkouts immediately" checkbox.
- Close your browser.
- Reopen your browser and check out to that patron again. Checkouts
  should now be displayed by default.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

Works as described. I confirm that without this patch, the un-persistance of
"show checkouts" choice is very perturbing for librarians coming from previous
version of Koha.

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

Passes tests and QA script, no problems found.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-21 02:44:34 +13:00
Mason James 2a1ba095cb ammend patch for bz13168, remove 'auto_renew' line
modified:   C4/Circulation.pm
2015-01-20 05:05:42 +13:00
Kyle M Hall 6b0a77a9b5 Bug 13195 - Regression: Circulation checkouts table no longer shows item type description
Another regression caused by Bug 11703: The list of checkouts on the
circulation and patron detail page shows item type codes instead of the
full description.

Test Plan:
1) View a patron's checkouts, note the Item type column displays the
   code rather than the description.
2) Apply this patch
3) Refresh the page, note the description is now displayed

Signed-off-by: Frederic Demians <f.demians@tamil.fr>

Works as described.

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

Works as described, no problems found.
Passes tests and QA script.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:48:39 +13:00
Olli-Antti Kivilahti a2887ac9cf Bug 13168 - "Today's checkouts" sort improperly because issuedate lacks seconds.
TO REPLICATE:

Prepare a bunch of Items (6+) for checking out, or have a set of barcodes ready for copy-pasting.
Check-out those items quickly within one minute and observe that the sorting order is not always from the first checkout to the last.

This is because the issuedate doesn't have seconds defined.

AFTER THIS

The bunch of Items is sorted properly.

Tiny patch, works as expected. Passed QA script.
Signed-off-by: Marc Veron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:43:23 +13:00
Kyle M Hall f5a69334b6 Bug 13122 - Patron holds table no longer display date item went in transit
In Koha 3.14 and earlier, an item on hold and in transit would display
the date the item was transferred. This is missing from the new ajax
holds table.

Test Plan:
1) Place an item on hold for delivery at a different library
2) Check the item in, confirm the hold and transfer
3) View the patron's holds tab on circulation.pl and/or moremember.pl
4) Note the item is show as in transit, but does not give the "since"
   date
5) Apply this patch
6) Note the in transit status now has a "since <date>"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small change, works as described.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:22:01 +13:00
Kyle M Hall f4c5c4f093 Bug 12971 [QA Followup] - Fix error caused by patron not having any checkouts
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

This successfully fixes the problem observed when a patron has no
checkouts.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:17:44 +13:00
Kyle M Hall 49f749e130 Bug 12971 [QA Followup]
* Makes the status column display "Overdue!" if overdue
* Fixes the due date formatting
* Sorts the checkouts by date due ( oldest to newest )
  Note: I found no evidence that this data was previously sorted,
  so I kept it simple. Sorting based on system preferences could
  be a future enhancement.

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

This fixes the issues described for patrons with existing checkouts.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:17:41 +13:00
Kyle M Hall f51362eedf Bug 12971 - Regression: Patron print summary doesn't show checkouts
A patron's print summary should contain a list of checked out items
as it did in 3.16.2 and earlier.

Please note, as of 3.16.2 reserves were no longer part of the print
summary and thus are not part of this bug fixing patch.

Test Plan:
1) Find a patron with checked out items
2) Choose Print -> Print summary
3) Note the lack of a list of checkouts
4) Apply this patch
5) Reload the page
5) Print the summary again
6) Note the list of checkouts

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Works as described, apart from the missing status information
that Owen already noted on the bug.
Passes tests and QA script.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 03:17:36 +13:00
Chris Cormack f0999f40bf Bug 12892 : Alternate fix to restore the deleted code
This doesn't depend on anything other patch.

1. Create a reservation for a Borrower with pickup branch
2. Check-in the corresponding Item in the pickup branch and confirm the hold
   for the Borrower
3. Go to circ/circulation.pl for the Borrower and verify that the reservation
   is "Waiting for pickup"
4. In the Borrower -> Check Out -tab (circ/circulation.pl) on the right of the
   big "Checking out to borrowername" should be a notification about holds ready
   for pickup.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Rafal Kopaczka <rkk0@poczta.onet.pl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script, restores the old code and behaviour.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 02:39:11 +13:00
Kyle M Hall 9f0326bcb2 Bug 12778 - Regression: Item lost status doesn't show in list of checkouts
When using the longoverdue script it's possible that items marked lost
remain on the patron account. I think it's important for staff to see
that some items are marked lost - currently the list of checkouts
doesn't show any sign of the lost status.

Test Plan:
1) Find a patron with a checked out lost item
2) Note the lost status is not displayed in the checkouts table
3) Apply this patch
4) Refresh the page, note the lost status now displays
5) Repeat this test plan for a damaged item

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with damaged and multiple lost values.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, no problems found.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 02:26:56 +13:00
Jonathan Druart f8432bb26d Bug 13190: Refactor the checkouts table template code
This code is duplicated and should be centralised.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
2015-01-20 02:17:48 +13:00
Jonathan Druart b633f56c35 Bug 13190: Reintroduce the checkouts export feature
Bug 11703 breaks the checkouts export feature.

To reproduce: Fill the ExportWithCsvProfile pref and go on the
circ/circulation.pl page. The export column appears, but not the export
button.

Test plan:
Go on the checkout list (circ/circulation.pl and members/moremember.pl)
and verify the export column and the export button appears.
If you click on the button, a file should be generated.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-20 02:16:37 +13:00
Kyle M Hall 5dc1477beb Bug 11518 [QA Followup] - Make unit tests pass
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2015-01-19 16:23:00 +13:00
Kyle M Hall e1c2dbcd02 Bug 11518 [QA Followup]
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2015-01-19 16:22:59 +13:00
Kyle M Hall 3243e7fc48 Bug 11518 [Followup] - Change method name from 'itemtype' to 'effective_itemtype' for clarity
Test runs without errors.

Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2015-01-19 16:22:59 +13:00
Kyle M Hall 26897109c9 Bug 11518 - Add new method to Koha::Schema::Result::Item that will always return the correct itemtype
There are many disparate areas of Koha that deal with item level
itemtypes vs record level itemtypes. We can take advantage of
DBIx::Class to make smarter objects that automatically return the
correct value depending on the system preference.

Test Plan:
1) Apply this patch
2) Run t/db_dependent/Items.t

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-19 16:22:53 +13:00
Katrin Fischer 8669981321 Bug 9958: Improve RoutingSerials sys pref description
The RoutingSerials preference controls if the routing
list related functionality is visible in the serials
module.

To test:
- Go to the system preference editor - RoutingSerials
- Check the current description
- Apply patch
- Check the new description
- Verify functionality matches description

NOTE: The preference change is merely cosmetic. The value is
      still YesNo. A few git reset --hard origin/master
      and page refreshes confirmed expected values.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:50:23 +13:00
Katrin Fischer 6110bcb517 Bug 12565: Acq: Fix broken link in breadcrumbs
The link back to the basket when creating an order by
searching for an existing record in the catalog is
broken.

To test:
- Start a new basket
- Create a new order line by searching for an existing
  record in your catalog
- Try the link back to the basket from the breadcrumbs
  at the result list page
- Verify that the link is broken
- Apply patch and retest

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:44:22 +13:00
Marc Véron b70ad8fadf Bug 13422 - SCO: "Would you like to rpint a receipt" not translatable
To test:

Set syspref SelfCheckReceiptPrompt to "Show"
Select non English language
Go to Self Checkout and check out an item
Hit "Finish"
Make sure that confirm dialog "Would you like to print a receipt" still
appears

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:42:58 +13:00
Marcel de Rooy 01970096d2 Bug 13416: Typo in marc21_leader.pl position 5 (record status)
Instead of a space in the leader on this position, it should be an a.

Test plan:
1) Log in to staff client
2) Find a record in the catalog
3) Edit the record
4) Click the on builder popup icon.
5) View the page source
   -- the option is " " for the 'a- Increase in encoding level'
      entry. It really should be 'a'.
6) Apply patch.
7) Repeat steps 1-5
   -- the option should be 'a' this time.
8) Run koha qa test tools.
   -- Discovered it failed. Provided a patch to fix this.
      It does, however, solve the major problem of ' ' vs. 'a'.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:41:54 +13:00
Kyle M Hall daef7c5d78 Bug 13400 [QA Followup] - Fix tabs and quotes
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:35:40 +13:00
Marc Véron eca2d65a29 Bug 13400 - Untranslatable "Are you sure you want to delete this authority?"
This patch makes the string "Are you sure you want to delete this
authority?" translatable using the function _(...)

To test, apply patch and check that deleting authorities still works.

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

Tested successfully with the following procedure:

1. Applied the patch.
2. Ran perl translate update de-DE
3. Edited de-DE-i-staff-t-prog-v-3006000.po to add a "translation"
4. Removed "#, fuzzy" marker from po entry.
5. perl translate -v install de-DE
6. Testing deleting an authority from the authority search results page
   and from the detail page. My translated string appeared correctly.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:35:39 +13:00
Jonathan Druart f23b44887d Bug 12059: Prefer to list fields in the query
To avoir further issue, it's better to explicitely list the fields we
want to retrieve.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:28:25 +13:00
Katrin Fischer f9c17a4ef6 Bug 12059: Publisher column on invoice page always empty
This patch moves the publisher information out of its own
always empty column into the Summary column below the title,
as it is on other acq pages.

The information was never displaying, as publishercode is in
biblioitems and that table was not selected by GetInvoiceDetails.

Also modified the code to take into account that UNIMARC uses
biblioitems.publicationyear and MARC21/NORMARC use bibio.copyrightdate
for the copyright year.

To test:
- create an invoice for records that
  - have a publication year
  - have no publication year
  - have a publisher...
- 'finish receiving' and check the invoice summary page
   ...acqui/invoice.pl?invoiceid=?
- Make sure all the information displays now but didn't witout the patch.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:28:25 +13:00
Kyle M Hall e52ef1182a Bug 13410 [QA Followup]
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:22:54 +13:00
Marc Véron 4f206bac22 Bug 13410 - Untranslatable "Change messaging preferences to default for this category?"
To test:
In staff client, go to Home > Patrons
Click button "New patron" and choose a category
Change Patron messaging preferences
Now change Category
Make sure that following message box still appears: "Change messaging
preferences to default for this category?"

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-18 13:22:53 +13:00
Mason James c9b3317512 Revert "Bug 12868: Improving t/db_dependent/Member.t"
This reverts commit b8ef9e2885.
2015-01-17 19:00:12 +13:00
Mason James 8a64adede7 Revert "Bug 13378: Add a filter to search suggestions not linked to a fund"
This reverts commit 10ee2cd2f1.
2015-01-17 16:41:49 +13:00
Mason James 0286f18c02 add 'use Test::MockModule' to t/db_dependent/Members.t 2015-01-17 14:16:20 +13:00
Mason James b0884b4d59 Revert commit for bug 13502 2015-01-17 13:19:06 +13:00
Mark Tompsett 05a9deaacd Bug 12868: Wrong variable used for borrower number
When only the card number is passed to GetMemberDetail, the
value of $borrowernumber is undefined. Even after finding the
correct borrower and providing a nice hash ($borrower), the
GetMemberAccountRecords is called with the wrong borrower number,
even though it is in the hash ($borrower).

This was fixed by changing $borrowernumber to
$borrower->{borrowernumber}, so that the hash's value will always
be used, since it is correct regardless of whether borrowernumber
or cardnumber were used to find the borrower.

TEST PLAN
---------
1) Apply both patches
2) prove -v t/db_dependent/Member.t
   -- This time the previously failing test will pass.
3) run koha QA test tools.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
2015-01-17 12:39:52 +13:00
Mark Tompsett b8ef9e2885 Bug 12868: Improving t/db_dependent/Member.t
The mock function of GetMemberAccountRecord did not properly
account for the undef case. This was corrected.

Then all 4 combinations of borrower number and card number being
defined or not were called to GetMemberDetail.

The problematic test case is where the borrower number is
undefined and the cardnumber is defined.

TEST PLAN
---------
1) Apply just this first patch.
2) prove -v t/db_dependent/Member.t
   -- This should fail!
3) Run koha QA test tools.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:39:47 +13:00
Olli-Antti Kivilahti c5d177b82e Bug 12922 - Do not DIE the advance_notices.pl -cronjob if no letter of type is found!!
We failed to deliver advance_notices because a template for sms's is undefined, because we don't support
sending sms' as advance_notice.
This crashed the cronjob because digests are set to die instead of the warn used in non-digest.
And we get angry customers asking for compensation!

This patch replaces the die with warn.

TEST PREPARATION:

0. Edit the ODUEDGST letter, find an undefined letter for any trasport type.

TEST PLAN:

1. Find a borrower and from the messaging preferences set the "Advance notice" transport type to
   the undefined digest. Set the "Days in Advance" to 1.
2. Check-out something for that borrower and set the due date for tomorrow.
3. Run "misc/cronjobs/advance_notices.pl -c -n -v" from the terminal.
4. BEFORE THIS PATCH: You get an error
   "No circulation PREDUEDGST letter transported by sms at /home/koha/kohaclone/C4/Letters.pm line 609."
   and the script dies.
4. AFTER THIS PATCH: You get an error
   "No circulation PREDUEDGST letter transported by sms at /home/koha/kohaclone/C4/Letters.pm line 609."
   but the script keep on going!

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:37:18 +13:00
Colin Campbell 1b48202e28 Bug 13522: Make it explicit that scalar containd a hash ref
Prior to perl 5.12 keys can only operate on a hash. So although
$data[0] ( thats an abysmal variable name! ) will contain a hash ref
the perl compiler cannot deduce that from the context and gives
a syntax error. Add the hash sigil to make the context explicit and
the compiler can generate the correct code.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:36:01 +13:00
Jonathan Druart 10ee2cd2f1 Bug 13378: Add a filter to search suggestions not linked to a fund
This patch adds a "None" option for the fund filter.

Test plan:
1/ Go on the suggestion search page
2/ Search suggestions not linked to a fund using the "None" option.
3/ Search all suggestions (linked or not to a fund) using the "Any" option.

Works as expected.
Signed-off-by: Marc Veron <veron@veron.ch>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:32:32 +13:00
Jonathan Druart d21856d2ad Bug 13369: table should been highlighted correctly when row are grouped
The css used to highlight the rows comes from staff-global.css
We need a more specific rule to be used.

Test plan:
Go on the fund list view and confirm that the rows are correctly
highlighted.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:29:14 +13:00
Chris Nighswonger b2d7832aab Bug 13407 Bumping required version of PDF::Reuse
Signed-off-by: Chris <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:27:15 +13:00
Chris Nighswonger 5ab7aa964a Bug 13406: Removing depricated code included in PDF::Reuse
1. Upgrade PDF::Reuse to 0.35_04. [1]
2. Run Koha's non-DB dependent test suite. You should notice some non-fatal warnings about
   the redefinition of one or two subs in PDF::Reuse. This should not affect the
   functionality of the tools for the end user.
3. Verify the functionality of the related tools.
4. Apply the attached patch.
5. Re-run Koha's non-DB dependent test suite. You should note no warnings related to PDF::Reuse.
6. Re-verify the functionality of the related tools.

[1] http://search.cpan.org/CPAN/authors/id/C/CN/CNIGHS/PDF-Reuse-0.35_04.tar.gz

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Chris <chris@bigballofwax.co.nz>

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:27:14 +13:00
Kyle M Hall 878e044963 Bug 11872 - Lost overdue items should not generate fines
An item can be marked as lost by longoverdue.pl, but left checked out to
the patron. In this case, the item will continue to accrue fines.

Test Plan:
1) Check out an item and back date it so it is overdue and should
   generate fines.
2) Mark the item as lost by either using longoverdue.pl, or just
   by setting itemlost to 1 by directly accessing the database
3) Run fines.pl
4) Note the overdue generated a fine
5) Repeat steps 1-2
6) Apply this patch
7) Run fines.pl
8) Note a fine was not generated

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
2015-01-17 12:25:35 +13:00