Commit Graph

23285 Commits

Author SHA1 Message Date
Jonathan Druart 30a3ba393f Bug 11298: Don't force the renew time to 23:59
If you try to renew an item using the "Renewal due date" at the bottom
of the checkouts table, the time will be hardcoded to 23:59 no matter
what the user has chosen.

Test plan:
Check an item out to a patron
renew the item and specify a due date using the datetime picker plugin
at the bottom of the table
Confirm the time you have chosen is correctly used.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a011cbd2e2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 7f39c6a00c)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:47:56 +13:00
Jonathan Druart d1bc1a039f Bug 14990: Format the date template-side for moremember
Test plan:
print slip and show the member detail page, the 3 dates date of birth,
date enrolled and date of expiry should be displayed correctly.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6506ddd1e8)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Conflicts:
	members/moremember.pl

(cherry picked from commit 0960249688)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:38:03 +13:00
Rafal Kopaczka 9324535985 Bug 14966: Table header broken at detail.tt
For user without item edit permission, table at catalogue/detail.pl is
corrupted.

Test plan:
1) Log in as staff member, without edit item permission.
2) Go to biblio view, with items attached:
/cgi-bin/koha/catalogue/detail.pl?biblionumber=X. Confirm that table
does not display correctly.
3) Apply patch.
4) Repeat steps 1 and 2. Confirm patch works.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 390233a10c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit bacb977317)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:33:42 +13:00
Julian Maurice d2ce611bf6 Bug 14940: Fix sorting in opac-topissues.pl
There is hidden text in "Checkouts" cells that prevent DataTables to
sort numerically.
This patch adds the 'title-numeric' sort plugin and use it in
opac-topissues.pl

Column 'Checkouts' in Home > Most popular items sorts as expected
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2f0e409f47)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit e14557ecd9)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:29:46 +13:00
Jonathan Druart 7f83431fb8 Bug 14812: Display the help in the correct language
If opaclanguages != language, the language of the help page is the
default one (en).

Test plan:
1/ Set language to en, fr-FR, ar-Arab and opaclanguages to en, fr-FR
2/ Translate the fr-FR and ar-Arab templates.
3/ Go on the mainpage, switch to ar-Arab, go to the help page.
The help page content should be in Arabian, not English.

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Set language = en, sv-SE, nb-NO. opaclanguage = en, nb-NO
Went to the intranet main page, selected Swedish and clicked on help
Without the patch, help was displayed in English
With the patch, help was displayed in Swedish. Yay!

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a4ee9151c1)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 006a44cc6c)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 14:19:45 +13:00
David Cook 51efc8fc59 Bug 14861: Accession date comparison does not work in advanced search
_Test plan_

Prerequisites: Make sure that you have an item with a valid dateaccessioned,
and that the bib is indexed in zebra.

For the purposes of explanation, I'm going to use the date '2011-09-07'

1) Go to advanced search in the staff client and choose 'Acquisition date (yyyy-mm-dd)'
2) Enter 2011-09-07 (or the date of your choice).
3) Click the search button - you should get your item in the search results.
4) Return to the advanced search screen and select Acquisition date again.
5) Enter a start and end date in the text field separated by ' - '.

For example:

2011-09-01 - 2011-09-30

6) Click the search button -- this will return no results.
7) Apply the patch and copy etc/zebradb/ccl.properties to whatever directory is specified
by the koha-conf.xml referenced by $KOHA_CONF.
8) Try the search again -- this will return the expected results

Signed-off-by: Barton Chittenden <barton@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5a9b8d9359)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 2579506864)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 14:16:39 +13:00
Jonathan Druart 5aa8867969 Bug 14141: Fix copy action
Test plan:
Try to copy a letter to a library which already have this letter (same
letter_code) defined.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 51aad946c6)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 2943112a28)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 14:14:49 +13:00
Jonathan Druart 5f6d48c25e Bug 14141: Do not let edit the branch when updating/copying notice
If a user modify the library when he's updating a notice, the notice
will be duplicated, instead of modified.

To reproduce:
1/ Go on the notice & slips tools (tools/letter.pl)
2/ Create a notice A for library L1
3/ Edit this notice and update the library with L2
4/ On the list view, you will observe that 2 notices A now exist, one
for L1 and one for L2.

The code in tools/letters.pl should be rebuilt completely, it becomes a
house of cards. To prevent this bug, I suggest to not let the user
modify the library value on editing a notice.
It cans be done by copying the notice to another library and remove the
original one.
Counter patch welcomed.

Test plan:
1/ Go on the notice & slips tools (tools/letter.pl).
2/ Create a notice A for library L1.
3/ Edit this notice: you are not able to modify the library anymore.
4/ Copy the notice to library L2. You are not able to modify the library
neither.

Works ok.

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>
Signed-off-by: Nick Clemens <nick@quecheelibrary.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 605f42a721)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 54cf2cc340)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 14:12:04 +13:00
Jonathan Druart f4002fb9b4 Bug 14811: Don't update permanent_location with CART or PROC
The permanent_location should not be set to CART or PROC when the item
is edited.
Otherwise we lost an important info.

Test plan:
0/ Set the ReturnToShelvingCart pref
1/ Create an item with location "on_my_shelf"
2/ Check the item in and out
3/ Look at the DB values, location should be "CART" and
permanent_location unchanged (on_my_shelf)
4/ Edit the item, add a note for instance
5/ Without this patch, the permanent_location is erased with 'CART' and
you have definitely lost the info.
With this patch, the permanent_location is unchanged.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 2a319e7ae2)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Conflicts:
	t/db_dependent/Items.t
2015-10-28 14:02:22 +13:00
Tomas Cohen Arazi 6bc08252b4 Bug 14820: DBRev 3.18.11.001
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b8f0a59534)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>

Conflicts:
	Koha.pm (3.18 does not have)
	installer/data/mysql/updatedatabase.pl (routine version updates)
2015-10-28 11:50:24 +13:00
Jonathan Druart 2c46810e7b Bug 14820: Add missing prefs SMSSendUsername and SMSSendPassword
These 2 system preferences are missing from the sysprefs.sql file.

Test plan:
Execute the updatedatabase script and confirm that the 2 prefs are now
in the systempreferences table.
Search for "sms" in the system preferences search box, you should see
the 3 prefs.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 39dc8b5a9d)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 27e58d8a20)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 11:45:23 +13:00
Jonathan Druart 62839fc486 Bug 14910: Redirect to the circulation module after a renew
iIf a patron is renewed from the circulation module, the librarian
should be redirected to the circulation module.
This works correctly if the renew is done from the patron module
(members).

This is caused by a typo in the template: desintation vs destination.

This patch also removes the cardnumber parameter to the setstatus.pl
script, it is not needed given that borrowernumber is always passed.

This has a good side-effect, it will fix bug 14691. The cardnumber does
not exist anymore, so no need to escape it :)

Test plan:
0/ Do not apply this patch
1/ Create a patron with a cardnumber with a quote (rm'me) and another
one without a quote (rmme)
2/ Go on the checkouts page (circ/circulation.pl)
3/ Renew the 2 patrons
=> With rm'me you are redirected to the circ module - ok
=> With rmme you are redirected to the member module - nok
4/ Go on the patron detail page (members/moremember.pl)
5/ Renew the 2 patrons
=> you are redirected to the member module - ok
6/ Delete the patrons
=> Nothing happend with rm'me, there is a JS error on the page - nok
=> rmme is deleted - ok

7/ Apply the patch and recreate rmme
8/ Repeat 2, 3, 4, 5
=> You are redirected to the correct module
9/ Delete the patrons
=> They are successfully deleted

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Followed the test plan, works as advertised. (I did have some problems
initially, but that was caused by me not using the interface in
English...)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 653d305452)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit dcd54915d0)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 10:25:57 +13:00
Marc Véron b66cf0d486 Bug 14929: Fix missing display of help page in contract management
This patch renames / moves  the file
koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/acqcontract.tt
to
koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqcontract.tt

To test:
- Go to Home > Acquisition > [Vendor] > Contracts
  (/cgi-bin/koha/admin/aqcontract.pl?booksellerid=XXXX)
- Verify that Help displays as appropriate.

Signed-off-by: Magnus Enger <magnus@libriotech.no>
Works as advertised. All the tabs similar to "Contracts" have
working help pages.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 4a43c38205)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7f1efe0898)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 10:18:48 +13:00
Jonathan Druart 5affdbacb1 Bug 12311: Do not return a lost item if modified in a batch
If a item is lost and issued, and you modify it in a batch, the item
will be marked as returned. It should only be returned if the item is
marked as lost.

Test plan:
1/ Check an item out and mark it as lost
2/ Edit it in a batch (tools/batchMod.pl) and edit a field (notes for
instance)
3/ The item should still be issued to the patron
4/ Edit it in a batch and edit the lost value, marked it as not lost
5/ The item should still be issued to the patron
6/ Edit it in a batch and edit the lost value, marked it as lost
7/ The item should have been returned.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Just one comment, lost status can be changed only if you change default framework to another framework then edit the item. If you change it in Item menu at left side of screen this will remove the item from patron’s checkouts and patron charged for lost item.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
For testing purposes the lost item field can be set to visible
in the framework used. That will allow changing it without
returning it at the same time.
The other option is using the longoverdues.pl script.
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

(cherry picked from commit ca268ad877)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6709813a02)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-28 10:16:24 +13:00
Liz Rea c44e419be7 Merge remote-tracking branch 'origin/3.18.x' 2015-10-20 10:06:26 +13:00
Liz Rea 9625e73f57 Bug 6756 - remove tests, no testbuilder in 3.18 2015-10-20 10:04:20 +13:00
Jonathan Druart f7625e84c7 Bug 14562: All patrons returned if 1 has a cardnumber set to an empty string (Fix conflict with bug 12833)
This patch is a backport of (Bug 12648 is in 3.20.x, not 3.18.x):
commit 481479fe62
    Bug 12648: Fix conflict with bug 12833

Test plan:
Set the cardnumber of one of the patron to an empty string
Do a patron search and use filters
The search will redirect to the patron detail page of the patron with
the empty string

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-20 09:47:32 +13:00
Kyle M Hall 5d5e187cf0 Bug 14733: Unit Tests
Signed-off-by: Heather Braum <hbraum@nekls.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Conflicts:
	t/db_dependent/Holds.t
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-16 14:17:34 +13:00
Jonathan Druart 4d243109b3 Bug 14733: Replace 'priority' with 'estimated priority'
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 8ef69e473b)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-16 14:06:33 +13:00
Kyle M Hall 359dac4781 Bug 14733: Prevent a record from having holds with duplicate priorities
It is possible to create holds with duplicate priorities.

The reason for this is that typically the priority is calculated before
placing the hold. When the hold is placed the priority is calculated.
This can easily be shown by opening up two browser windows and starting
to place a hold for a record in each one. You'll see that both list the
same priority. If you than place the hold in each window, both holds
will have the same priority!

Test Plan:
1) Run unit tests pre-patch, note they fail
2) Run unit tests post-patch, note they succeed

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 37ad2d7867)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-16 14:05:29 +13:00
Jonathan Druart fda6ea7c32 Bug 13675: Do not set aqorders.budget_id to NULL
C4::Acquisition::ModReceiveOrder updates the aqorders with
budget_id=NULL if no budget_id given in parameter.
Actually the same budget_id should be used.
In tests (especially t/db_dependent/Acquisition/TransferOrder.t),
ModReceiveOrder is not called with a budget_id param and set to NULL the
budget_id value.

test plan:
  prove t/db_dependent/Acquisition/TransferOrder.t
should return green

Note that this bug should not appear using the interface.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
The fix makes sense, and running
 $ prove t/db_dependent/Acq*
returns all green. koha-qa.pl also likes it.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 2df541712f)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-16 11:28:42 +13:00
Jonathan Druart d33fc31427 Bug 14509: Reject invalid passwords
Bug 10177 rejects password with leading or trailing whitespaces, but
only on the member-password page.
It's not consistent to only do this check on 1 place.
This patch adds the check for the 2 other places: memberentry and at the
OPAC.

Test plan:
1/ Edit a patron and set a password with leading and/or trailing
whitespaces. You should not be allowed to do it (no server side check).
2/ Same at the OPAC ("Change you password" tab). Here there is a server
side check.

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

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 1b8f3194e9)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a19c1257eb)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-14 16:25:15 +13:00
Brandon d43ac5bfa6 Bug 10177 - Whitespace is accepted within the password but leading and trailing spaces are not.
Test plan:
1: Go to your patron
2: Go to change username and/or password.
3: Change password to something with spaces in the middle. Notice it is invalid.
4: Apply this patch.
5: Change password again using spaces in the middle. Notice it is accepted.
6: Change password with leading and/or trailing spaces, notice they are not accepted.

Applied bothe patches. Followed test plan. Patch behaves as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
2015-10-14 16:18:06 +13:00
Brandon 2bdb186a02 Bug 10177 - whitespace is a valid password causing pernicious perturbations.
Test plan:
Go to your patron, go to change username and/or password. change
password to whitespace, notice it is accepted, apply this patch,
change password again, to whitespace, notice password is not valid.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
2015-10-14 16:18:06 +13:00
Liz Rea 743095cc82 Revert "Bug 14813: Fix encoding issues on editing help pages"
This reverts commit 16ebbebe4f.

Not actually applicable
2015-10-01 11:32:03 +13:00
Liz Rea 2ff022ec80 3.18.11 Release notes 2015-09-23 15:08:30 +12:00
Liz Rea 368e04d979 Bumping version number for release 2015-09-23 15:08:30 +12:00
Liz Rea 04000eacbe Bug 14298: Update database 2015-09-23 15:08:30 +12:00
Jonathan Druart 23b7e06bf9 Bug 14298: Add perms for other languages
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit cf098649a8)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:30 +12:00
Jonathan Druart 39e5ecc7ac Bug 14298: Add warning to the about page if the sco user does not have correct permissions
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Note: Made a little change, changed He should have, to They should have

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit f2663af7d1)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Jonathan Druart 03c95d38e3 Bug 14298: Use the new permission in the sco scripts
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Note without this patch, you won't be able to access the SCO side.
So don't panic if you cant use SCO with just the first patch

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 047f0a486b)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Jonathan Druart 255d4023cd Bug 14298: Add the new 'self_checkout' permissions
There is a security issue in the self checkout module.
The user used to check items out must have the circulate =>
circulate_remaining_permissions permissions.
So even if a user does not have a login/password or a barcode he cans
access to the circulation module of the intranet.
Imagine if the sco patron used is a superlibrarian...

This patch set will change the behavior and adds a new permission to
access to the sco module (circulate => self_checkout).
This permission should be the only one defined for this patron.

IMPORTANT NOTE: Hopefully, this only works if both interfaces use the
same domains (but different ports).

Test plan:
0/ Does not apply this patch set
1/ Create a patron with the circulate => circulate_remaining_permissions
and some others. Note his userid/pwd (later 'sco/sco').
Turn on WebBasedSelfCheck and AutoSelfCheckAllowed
Fill the AutoSelfCheckID and AutoSelfCheckPass wich 'sco' and 'sco'
2/ Log you out from the OPAC and the intranet
3/ Go on the sco page
4/ Note that your are automatically logged in
5/ Go on the circulation module on the intranet side
6/ Oops
7/ Apply this patch
8/ Execute the updatedatabase
9/ Note that the sco user only has the new permission circulate =>
self_checkout, others have been removed
10/ Try to reproduce the issue, it should not access anything on the
intranet side
11/ Confirm that there is no regression in the sco module

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

Works well no regressions, changes the permissions appropriately.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit 08c7606c36)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Aleisha 1900642549 Bug 14585: Fixing up online help on main page
To test:

1) Go to home page of staff client and click the Help
2) Notice: 'you should now 'got to' Koha'
	   'settings found in 'a'dministration.' (should be capitalized)
	   'Once that user is set you should use that user to log in rather than the root user set up as part of installation.' (could be worded better)
3) Apply patch, close Help, reload page, reopen Help
4) Notice: 'got to' --> 'go to'
	   'administration' --> 'Administration'
	   'Once that user is set you should use that user to log in rather than the root user set up as part of installation.'

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit d810fd1094)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 14e3841f51)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Genevieve Plantin 14f8a91733 Bug 13781: Fix missing heading columns for relative's checkouts table in check out patron page
Theres was two missing heading columns Location and Fines in the Check out section of a Patron

Tested both patches together. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit bcb6e9ea39)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b73c432887)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Tomas Cohen Arazi c7efb1619a Bug 14245: (QA followup) already global
The original patch correctly unmasks the global variable (by
removing the 'my' on the marc2ris function, but wrongly introduces
a new global variable.

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 7349777f14)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 2d4e38a257)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Bernardo Gonzalez Kriegel 723cac987c Bug 14245: Problems with RIS export in unimarc
Variable $itype is used an all C4/Ris.pm to switch
between marc falvors, but is local and not passed along
as argument.

As a quick solution, is defined as global

To test:
1) On UNIMARC setup, export a record as RIS,
check that author (and other fields) are displayed
incorrectly

2) Apply the patch

3) Export again, improved results

4) Run t/Ris.t

There are other problems in this script, needs maintenance
(e.g. no Modern::Perl friendly)

Signed-off-by: Victor do Rosário <jvr@fct.unl.pt>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit e15621fee2)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 4c7bd247ef)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Kyle M Hall 4da312f724 Bug 14640: 'Cancel Hold' check box on check-out confirmation does not cancel the hold when item is checked out.
This bug is dealing with the situation where an item is checked out to a
patron that is not the next in line hold-wise for an item. In this case,
Koha will warn the librarian that there are holds on the item and
show the first person in line. Again, I want to stress that this
is the case where the item *is not waiting* for a patron. The
hold for the patron listed will just have a priority of 1.

The only situation where the "Cancel hold" checkbox will function
is when the priority 1 hold is an item level hold. This is due to
the fact that CancelReserve is being passed the trio of
biblionumber, borrowernumber, and itemnumber rather than the
singular reserve_id.

1) place biblio level hold on a book to borrower A.
2) check out an item of the book to borrower B.
3) When confirming checkout, check the 'Cancel hold' check-box, and
   click the "Yes, check out" button.
4) Note the hold was not canceled
5) Apply this patch
6) Repeat steps 1 through 3
7) Note the hold was indeed canceled

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit a37b3bb7f7)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b565d3a62a)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:08:29 +12:00
Jonathan Druart 4fd13caf84 Bug 10005: Inventory - Add an option to not check in items
The inventory tools automatically check in items, this patch adds it as
an option.

Test plan:
1/ Check an item out, fill a file with its barcode, and use this file in
the inventory tools.
2/ Check the new checkbox and confirm that the item is not checked in
3/ Repeat again and don't check it, the behavior should be the same as before
this patch.

Signed-off-by: Jason Robb <jrobb@sekls.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Added a missing </li>.
Patch works as expected.
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

(cherry picked from commit e5f604378a)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 1b03fc78a1)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:07:25 +12:00
Jonathan Druart f1a8202ccd Bug 7634: Prevent permanent_location to be set to NULL if not defined
The permanent_location is correctly filled when an item is added from
the cataloguing module (routine set_item_default_location from
cataloguing/additem.pl).
But when records are imported, this filled is not managed. It's only on
editing (_do_column_fixes_for_mod called from ModItem).

This patch set the permanent_location item fields to the location value for all
items created, even the imported ones.

Test plan:
0/ Do not apply this patch
1/ Import a record with items using the "Stage MARC for import" tool
2/ Check the values for the permanent_location in the items table.
They are set to NULL
3/ Apply this patch
4/ Repeat 2 and confirm that now the permanent_location values are set
to the location values.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit a2ca59efb8)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 3d74a820b2)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 15:07:25 +12:00
Jonathan Druart ea3ec5ed3d Bug 6756: Add info messages
NOTE: Before patch "./misc/cronjobs/batch_anonymise.pl --help" had no
      message, and neither did the anonymizing tool in the staff client.
      After the patch, both had informative messages.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 1acddd0f1b)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 715a7bf4f5)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 12:25:30 +12:00
Jonathan Druart 2d583678aa Bug 6756: Fix bad behaviors if AnonymousPatron is not defined
There are at least 2 wrong behaviors if the AnonymousPatron pref is not
defined (0 or empty string).
1/ If you use the clean borrower tools, you will get a successful
message when the nothing happened (the history has not been anonymised).
2/ At the OPAC, if a patron ask for delete his reading history, he will
get an error message "The deletion of your reading history failed,
because there is a problem with the configuration of this feature.
Please help to fix the system by informing your libr    ary of this
error". IMO this should not happen, the history should be anonymised.

With this patch, the old_issues.borrowernumber field will be set to NULL
if the AnonymousPatron pref if not defined.

Test plan:
1/ Fill the pref with "" or 0
2/ At the OPAC, go on the privacy tab and click on the "Immedia deletion" button.
You should get a green and friendly message. Confirm that the history
has been anonymised.
3/ Use the "Batch patron anonymization" tools (tools/cleanborrowers.pl)
to anonymize the checkout history.
Confirm that a) it works and b) you get a message.

Try again with AnonymousPatron set to a valid patron. You should not see
any changes with the current behaviors.

NOTE: This patch tweaks C4/Circulation.pm and provides tests.
      applying just this, and running prove success. Reverting just
      C4/Circulation.pm fails, as expected.
      Tested OPAC stuff with both patches applied.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 224b1c7976)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 085272aec0)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 12:08:09 +12:00
Jonathan Druart 16ebbebe4f Bug 14813: Fix encoding issues on editing help pages
It has been introduced by bug 11944.

Test plan:
1/ Install and set the fr-FR language (or ar-Arab).
2/ Go on the help page and edit it.
3/ The textarea should not contain encoding issues with this patch.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit d671b8661c)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:
	edithelp.pl
2015-09-23 11:56:18 +12:00
Jonathan Druart 2ed639cfb4 Bug 8723: Update hold_fill_targets, tmp_holdsqueue and linktracker tables
Same as previous patch for 3 other tables.

Test plan:
Same as before but the hold should exist to the 3 tables before the
move.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit c7a6745bc0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 74e6691cf8)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:53:45 +12:00
Jonathan Druart 0c55f4487a Bug 8723: Update the reserves table for item-level holds
If an item is moved from a biblio to another, the holds should be
updated too.

See discussion on the bug report for more information.

Test plan:
1/ Place a item-level hold on biblio1
2/ Move the item to biblio2
3/ Confirm that the hold still exists and point to the biblio2

This patch should not change the existing behavior for bib-level holds.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit 9f8f33e351)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 0a0f8b09d9)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:28:05 +12:00
Jonathan Druart 5c014d2f7f Bug 8723: Cover the existing behavior
This patch cover the MoveItemFromBiblio subroutine

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit cb4ce631c3)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 3caa3703c2)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:26:04 +12:00
Marc Véron ef217f48a4 Bug 14782: Add possibility to search patrons using the username (userid)
This patch makes it possible to search for users using the username (userid / login name).

To test:

- Apply patch
- Do searches from Home > Patrons
- Search after a full username or parts of a username with Search fields = Standard and Search fields = Userid
- Perform the searches from the top bar (expand with [+]) and from the "Filters" part at the left
- Make sure that other searches behave as before

Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit a71cc14a52)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 04319600c3)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:22:57 +12:00
Katrin Fischer aca61bd475 Bug 14782: Add tests
Run:
perl t/db_dependent/Utils/Datatables_Members.t

Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit f704fbebd8)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit b609ddc5db)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:21:17 +12:00
Jonathan Druart 9d7e88e325 Bug 14655: Add a warning if the checkin will fail
On the checkin and checkout page, the checkin will fail if the patron
has requested the privacy and the AnonymousPatron is not correctly set.

This patch adds a warning message on both pages.

Test plan:
0/ Be sure you don't have any patron with privacy=2 (Never)
1/ Set OPACPrivacy, not AnonymousPatron
2/ Go on the checkin, you should a warning (same as before this patch).
3/ Set the privacy=2 for a patron
4/ Go on the circulation page, a warning should appear (for this
specific patron)
5/ Check an item out to this patron
6/ Check the item in on the checkin page.
The item is not checked in and you get a specific message for this
patron.

Confirm other/correct situations don't trigger the messages.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
(cherry picked from commit cb2151529e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 625aec5b85)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:14:58 +12:00
Marcel de Rooy 2776573ba6 Bug 14683: [QA Follow-up] Similar change for staff
Script memberentry.pl contained a similar line.
Solution is simpler here.

Test plan:
[1] Add, change or clear the sms number at staff side.

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit bdf4894c50)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit c323e07c0c)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:09:03 +12:00
Marcel de Rooy 7b224a7d35 Bug 14683: [QA Follow-up] Mixup between mobile and smsalertnumber
This is an issue discussed on older reports already in the past.
Column mobile in borrowers is actually 'Other phone', not necessary a
mobile number. The name of the field is confusing. (Renaming it is
outside the scope of this report.)
The field that we are editing here is smsalertnumber. It should not be
compared with mobile at all.

What could be the side-effect of this correction?
===
First, the change is only relevant for libraries with pref SMSSendDriver
enabled.
In the past patrons editing their message preferences saw mobile (read:
other phone) in their smsalertnumber field (if the latter was still empty).
If they saved it, it was copied to smsalertnumber.
This change does not affect these patrons. They just have the same number
in two columns. No big deal.
What if a patron does not yet have a smsalertnumber? In that case no sms
is sent in Letters.pm. So no change in behavior. If he submits
opac-messaging now, he will no longer copy his other phone to smsalert [we
cannot assume that it was mobile anyway!]. If he enters a mobile number,
it will be saved correctly in the right field.

Conclusion: this change will not break things or hurt anyone. It only
prevents unwanted copying other phone to smsalertnumber.

Also modified the compare to prevent uninitialized warnings.
And removed a commented warn.

Test plan:
[1] Add, edit or delete the SMS number on opac-messaging regardless of
    the value of Other Phone (in the badly named mobile field).

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 9b8d7168be)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit bc72046421)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-09-23 11:08:15 +12:00