Commit Graph

23325 Commits

Author SHA1 Message Date
Kyle M Hall df64a9ca8a Bug 15079: Batch Delete Records Error
When using the batch deletion tool, if the script attempts to delete an
undeletable item, the script will die with the error:

Label not found for "next BIBLIONUMBER" at
/usr/share/koha/intranet/cgi-bin/tools/batch_delete_records.pl line 172.

Test Plan:
1) Attempt to batch delete a record with an item that cannot be deleted
2) Note error
3) Apply this patch
4) Repeat step 1
5) Note the error no longer occurs

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Follow comment 5 to reproduce the issue

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
I have not tested this patch, but looking at the code it is obviously a mistake.
If an error occured, we rollback and skip this record.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

(cherry picked from commit 706a31b50d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit dc39e4b410)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-11 12:25:15 +13:00
Aleisha b46754d842 Bug 14553: Silencing warn triggered when clearing item rating on OPAC
To test:

1) Go to any item and clear the star rating (don't have to set a rating first)
2) Notice the warn
3) Apply patch and reload page
4) Clear star rating
5) Notice no warn
6) Click a star to add a rating
7) Make sure your rating, the average rating and amount of votes are all
   correct
8) Could be beneficial to log in as another user and try to add a rating on the
   same item from their account. Check the average rating is
   cacalculated and amount of votes increases
9) Confirm still no warns

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Can see the warning in logs, and its disappearance with this patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

(cherry picked from commit 94c5f8d5f0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0a325ab7ba)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-11 12:19:18 +13:00
Jonathan Druart c11723f28a Bug 14735: Save cache_expiry on modifying a report
The cache_expiry is not saved when updating a SQL report.

Test plan:
0/ Enable memcached
1/ Create a sql report
2/ Edit it and change the cache expiry value
3/ Edit again
=> The value should have been updated.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Repeatable bug. Solved with this patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

(cherry picked from commit 27a15d5a42)
(cherry picked from commit eeb9a6c1e5)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-11 12:04:06 +13:00
Jonathan Druart 7e15f61a69 Bug 14575: Fix typo in opac-basket.tt
No more typo in the codebase.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit a0460ecc0a)
(cherry picked from commit da2dfc07e3)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-11 12:01:24 +13:00
David Cook b958af6f12 Bug 14575: OPACURLOpenInNewWindow should apply to item-level urls too
This patch applies the OPACURLOpenInNewWindow system preference
to item-level urls (in addition to the pre-existing bib-level url
handling).

_TEST PLAN_

Before applying:

1) Set OPACURLOpenInNewWindow to "don't" and click on an item-level url
2) Note that the current tab changes to that url
3) Set OPACURLOpenInNewWindow to "do" and click on an item-level url
4) Note that the current tab changes to that url

Apply the patch.

After applying:

5) Click on an item-level url
6) Note that the url opens in a new tab (as OPACURLOpenInNewWindow
should be set to "do")
7) Set OPACURLOpenInNewWindow to "don't" and click on an item-level
url
8) Note that the url opens in the current tab

9) Repeat the above steps 5-8 alternating
"TrackClicks" between "Don't track" and either "Track" or
"Track anonymously".

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e815d1e010)
(cherry picked from commit 219df070e8)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 15:45:52 +13:00
Colin Campbell b10ccd4665 Bug 15036: Do not overwrite complete status in basket ops
Reopening or closing a basket should preserve the completed
status for receipted orders.

This patch excludes orderlines with the completed status
from having their status rewritten as a result of the
change in basket status

Made the subroutines involved more efficient by removing an
unnecessary loop and by not fetching a large amount of
superfluous data

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 4a4dbbf123)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9dace4e21e)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 15:43:12 +13:00
Fridolin Somers 37ca7f59fc Bug 14867: userid not generated when defined in BorrowerUnwantedField
When userid is not provided when creating a new patron, it is generated
using surname and firstname.  The bug is when userid is defined in
syspref BorrowerUnwantedField, the input text is missing in patron
creation form. When saving you always get an alert message :
"Username/password already exists". No patron can be created.

This patch corrects by adding this case to userid generation conditions.

Test plan :
- add 'userid' in syspref BorrowerUnwantedField
- try to create a new patron : /cgi-bin/koha/members/memberentry.pl
- there is not input text for userid
- choose non-existing surname and firstname
- click on save
  => Without patch : patron is not created, you see the alert message
     "Username/password already exists"
  => With patch : patron is created, userid is generated with surname
     and firstname
- remove 'userid' in syspref BorrowerUnwantedField and check it can be
  defined in patron creation form

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  The issue is there, and this patch fixes it.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0cbc65111c)
(cherry picked from commit ee185cfd1a)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 15:31:27 +13:00
Jonathan Druart 839f8312a2 Bug 14388: Funds should be sorted by budget_code
Before this patch, the funds were sorted by budget_id, which does not
make any sense.

This patch adds a sort by budget_code on the fund list (acqui/acqui-home.pl and
admin/aqbudgets.pl)

Test plan:
On both pages (acqui/acqui-home.pl and admin/aqbudgets.pl) confirm that
the funds are now sorted by fund code (DB column budget_code)

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit e0032c46e9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 1cd654313b)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 15:05:08 +13:00
Joonas Kylmälä 9aa9a8ef37 Bug 14687: Patron's transaction history changes items' order after paying fines.
Sorts Patron's accounting data consistently from newest to oldest.
It doesn't depend on anymore to timestamp (which can be same for multiple
entries) from database but instead uses accountline's id to sort.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 307fe0ac53)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit eea56d4124)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:59:32 +13:00
Jonathan Druart 3c27f9c8c6 Bug 12540: Display "Every" on editing a MMT action if previously selected
On creating a marc modification template action, the "All" is changed with
"Every" if the condition field is the same as the original field.

But on editing, the "All" value is not replaced. For consistency, it
should.

Test plan:
1/ Create the following action:
    Copy field 650$x to 650$y if 650$z matches "foobar"
Note that the "All" is replaced with "Every" when the condition is the
same field as the original field.
2/ Save
3/ Edit the action.
The "Every" should be selected.

Without this patch, "All" is selected.

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 384dceeef5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 868bdc355d)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:49:24 +13:00
Tomas Cohen Arazi ede5e7c688 Bug 15151: Avoid DB access to load C4::Members
In order to avoid loading Koha::NorwegianPatronDB a DB query was
used. Instead, a require should be used. This causes non-db_dependent
tests that load C4::Members to fail.

To test:
- Shut mysql down
  $ sudo service mysql stop
- Run the tests:
  prove t/Circulation_barcodedecode.t
=> FAIL: DB connection is expected, tests fail
- Apply the patch
- Run the tests:
  prove t/Circulation_barcodedecode.t
=> SUCCESS: Tests pass
- Sign off .-D

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
cherry-picked from f25fe6ddb4
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

(cherry picked from commit bc668dccd3)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:42:48 +13:00
Mason James 9bcc69167c Bug 15035: Anti-spam for opac-suggestions - FOLLOW-UP
to test this patch...

1/ enable 'suggestion' and 'AnonSuggestions' sysprefs

2/ edit the koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt file,
    to reveal the hidden 'negcap' field

   replace line 87 opac-suggestions.tt, from...
     <li id="negcap" style="position: absolute; left: -2000px;">
   to ...
     <li id="negcap">

3/ attempt to add another suggestion, and populate the 'negcap' field
   adding the suggestion is supposed to fail, but actually succeeds!?  :/

4/ apply patch

5/ repeat step 3, suggestion attempt should fail as expected

	modified:   opac-suggestions.pl

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Confirmed insertion with negcap before patch.
With negcap value suggestion fails silently
Without negcap suggestion is inserted
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6b31947c3b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 49d2b2c84d)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:39:43 +13:00
Lyon3 Team ed24d7a8d7 Bug 15130: useless unitialization warnings when updating authorities
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Fixes a trivial coding error.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 6c94dc7987)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 34ae0f50ae)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:36:11 +13:00
Indranil Das Gupta 1ae8785540 Bug 14632: Fix alert message for single item batch
Fixes the incorrect msg "Please select at least label to delete."
for attempts to delete from single patron batches. Notifies the
user that doing so will delete the batch. It disallows direct
deletion, instead suggests the users to use the 'Delete batch'
option assuming the users know what they are doing.

Test plan
=========

1/ Load a single patron batch in edit mode and attempt to delete
   the single record. The JS alert message will inform that "Please
   select at least label to delete."
2/ Apply patch and refresh page and try to delete the single record
   again.
3/ This time the alert will inform the user that doing so will delete
   the batch and should that be desired action to choose the 'Delete
   batch' option from the toolbar.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  It works as before but with an understantable warning message.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 85ae12e586)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a698cd39db)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:32:03 +13:00
Marc Véron 6d01b9fcbd Bug 15117: Transfer Order: Better user information and translation handling
While transferring an order, a untranslatable JavaScript confirmation
dialog pops up.

This patch moves the information about the order to be transferred to the
top of the screen to better inform the user what order is to be transferred,
and simplifies the confirmation dialog.

To test:
- Apply patch
- Transfer an order from a basket to another basket
- Verify, that on top of the screen an information is displayed about which
  order from which vendor and basket is to be transferred
- Verify that the transfer works OK
- Update a po lang file and confirm you see the string and you are able
  to translate it.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Dialog box with readable & translatable info.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 571ec9a94b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 57a8479bf3)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:28:26 +13:00
Colin Campbell c61e33e6f0 Bug 14673: Work around change to AddIssue return
Return from AddIssue used to be due date or undef.
Now it is less straightforward returning am issue object
if an issue row is created or undef. If the issue is a renewal
undef is returned. As that case was not handled properly it
caused the server site to crash the listener causing a
communications error on the client.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit b4967bf0ed)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 374f5f4a38)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 14:26:25 +13:00
Marc Véron 744da17372 Bug 14781: Creation of barcode types 2of5 not functional
This patch fixes the rendering of "COOP2of5" or "Industrial2of5" barcodes in the label creator module.

To test:
- Create a label layout with COOP2of5 barcode type
- Create labels (make sure that the items's barcode values are numeric only!)
- Export batch and download PDF.

Without patch:
- No barcodes rendered
With patch
- Barcodes should render as expected. Test for both barcode types.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, tested both formats.
Non digit barcode is not printed.

No koha-qa errors, no t/ & xt/ errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Note: To be printed, barcode should be numerical.
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2b88f0cb38)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0d0b4ae848)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 12:19:38 +13:00
Sophie Meynieux 8e4c2bb2c7 Bug 14157: Notices tab in the patron record should not depend on EnhancedMessagingPreferences to display
Overdue and Hold notices can be sent even if EnhancedMessagingPreference
is set to "Don't Allow", so Notices tab have to be visible in all cases.

Test plan :
  - without patch :
    - set EnhancedMessagingPreference to "Don't Allow" and go to patron
      record : there is no Notices tab
    - set EnhancedMessagingPreference to "Allow" and og to patron
      record: there is a Notices tab

  - apply this patch :
    - go to patron record, you cas see a Notices tab
    - change the value of EnhanceMessagingPreferences, Notices tab is
      always visible.

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@theke.io>
(cherry picked from commit 471b1a8b69)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
3.20 had some other new (unrelated) things, resolved conflict and retested, all ok.
2015-12-10 12:13:20 +13:00
Fridolin Somers 1fe5ce9aa0 Bug 15059: Line break in html attribute in branchoverdues.tt
In circ/branchoverdues.tt, there is a line break inside href attribute.
This generates an attribute with a lot of spaces %20.

Test plan :
- at intranet go to ciculation module
- click on "Overdues with fines"
- look at links "Phone", "Notice" and "Considered lost"
=> Without patch the URL contains a lot of spaces
=> With patch the URL is correct

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 3e0b35c15d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 345d4a0341)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 11:23:17 +13:00
Jonathan Druart 477da3c192 Bug 10799: Limit the SCO user to the SCO module
The SCO user should only be allowed to access to the SCO module.

This patch make the session ends if the user tries to access another
page after the SCO module.

Test plan:
0/ Configure the SCO module correctly
1/ Go on the sco main page (sco/sco-main.pl)
2/ Try to go somewhere else: you should not be logged in

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 02feeca14f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 7853b503ab)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 11:02:27 +13:00
Bernardo Gonzalez Kriegel ce5b361fc8 Bug 15061: Can't add item to rotating collection
This patch prevents adding items to invalid (empty)
rotating collection id

To test:
1) Go to /cgi-bin/koha/rotating_collections/addItems.pl
2) Try to add an item, you get error show in attached pictures
3) Apply the patch
4) Go again to /cgi-bin/koha/rotating_collections/addItems.pl
5) Can't add any items

I don't know if this is a real problem

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@theke.io>
(cherry picked from commit fff73a7383)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a687841315)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 11:00:02 +13:00
Marc Véron 4bf09f1c51 Bug 15068: Get rid of warnings in members/summary-print.pl
This patch removes warnings when printing a summary from a member's
detail page, like:

- use of uninitialized value in sprintf
  at /usr/share/kohaclone/members/summary-print.pl line 47

- Use of uninitialized value $roadtype in concatenation (.) or string
  at /usr/share/kohaclone/members/summary-print.pl line 61

- Use of uninitialized value in addition (+)
  at /usr/share/kohaclone/members/summary-print.pl line 87

- Argument "2015-11-03 23:59:00" isn't numeric in numeric comparison
  (<=>) at /usr/share/kohaclone/members/summary-print.pl line 103

To test:
- Apply patch
- Go to a detail page with a member who has a lot of fines
- Print summary
- Verify that warnings like the ones above do no longer appear.

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  Have been able to see those warnings in Apache log file, and notice
  their disappearance after applying this patch.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c292dde75b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 95d9e029c8)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 10:58:29 +13:00
Joonas Kylmälä c543002df1 Bug 14773: Move help link back out of the dropdown menu
This moves the help link back out of the dropdown menu
like it used to be.

To test:

1. Notice that in intra the help link is inside the dropdown
   menu.
2. Apply the patch
3. Notice that the help link is now clearly visible in the
   top right corner of the page.

Sponsored-by: Vaara-kirjastot

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 47e2b8f7d8)
(cherry picked from commit 7d6a7e0b1b)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 10:53:00 +13:00
Nicole C. Engard eda3170f22 Bug 15094: Update link to Windows Offline Circ
This patch updates the link on the main circulation
page to point to the newest release of the offline
circulation tool.

To test:

* Go to Circulation
* Click 'Get desktop application'
* Confirm the link goes to github

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Link Ok
No errors

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 17bcc6a242)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fdfd946428)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 10:33:36 +13:00
Kyle M Hall 1a319d293c Bug 15010: Import patron tool creates 'duplicate' restrictions ( debarments )
If a patron has restrictions and a CSV file of patrons to be overwritten
is uploaded but has no debarred / debarredcomment columns, the a new
restriction will be added that combines all the existing restrictions (
i.e. a new debarment based on the existing borrowers.debarred
and borrowers.debarredcomment fields ).

Test Plan:
1) Create a patron with one or more restrictions
2) Import a CSV file that updates that patron, but with no debarred columns
3) Note a new restrictions is created
4) Delete the new restriction
5) Apply this patch
6) Re-import the CSV file again
7) Note that no new restriction is created
8) Add debarred and debarredcomment columns to the CSV file with a test
   date and description
9) Re-import the CSV file again
10) Note the new restriction is added to the patron

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Daniel Grobani <dgrobani@samuelmerritt.edu>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit fd12390365)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 37e7a6fe78)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-12-10 10:09:16 +13:00
Liz Rea ba048481d8 MoveItemFromBiblio.t requires testbuilder, which is not in 3.18. Removing tests. 2015-11-17 14:07:53 +13:00
Liz Rea bcbbf21cb5 Contract.t test fails because 'active contract' is no longer active 2015-11-17 14:05:14 +13:00
Liz Rea f33d7f17ac Fixing number of tests, Circulation.t 2015-11-17 13:52:12 +13:00
Jonathan Druart 1333bbca07 Bug 10181: Acq - Improve message for deleted records
There are some issues here:
1/ Message not translatable (set in the pl file)
2/ ' by 'displayed even if no author defined
3/ Message not the same every where
4/ Nothing displayed on the invoice page

Test plan:
1/ Create a basket
2/ Add 4 orders A, B, C, D
3/ On the basket, you see "$title by $author", or "$title" if no author
defined
4/ Delete order A, B
5/ Close the basket
6/ Receive B, C
7/ Delete record created for A, C
8/ Go on the basket page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record
9/ Go on the invoice page, you should see the title and "Deleted
bibliographic record, can't find title" for the deleted record

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@theke.io>
(cherry picked from commit 431d217a51)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6c4e68b2da)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-11-17 12:43:00 +13:00
Jonathan Druart 75c7dbb4a7 Bug 10181: Make string translatable
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@theke.io>
(cherry picked from commit 49f2837b2e)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b94d2d97d2)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-11-17 12:32:04 +13:00
Nick Clemens e532503dd7 Bug 14739 - Add several patrons to a new batch will create a new batch per patron added
This patch changes the functionality of adding patrons to patroncard batches.  Instead of using only the patron search, there is now a textarea which can either be manually populated with borrowernumbers, or can be populated using the patron-search

To test:
1 - Create a new patron batch
2 - Click the add items button, if there is no data in the borrowrnumber form you should get a popup
3 - Add items to batch using the popup, borrowernumbers should populate to the form
4 - Click add items again and items should be added to a new batch
5 - Create a new batch
6 - Manually enter invalid borrowernumbers to the form
7 - Click add items, batch should return empty
8 - Manually enter valid borrowernumber
9 - Click add items, batch should be updated
10 - Edit an existing batch and confirm add items works as above
11 - Create a new label batch
12 - Click add items with no data, popup item search should appear
13 - Adding items by checking boxes or using 'Add' button - they should populate the text box on the edit batch page
14 - When adding using form the 'Enter by itemnumber' button should be marked automatically
15 - Submit items and confirm they are added to batch
16 - Create a new batch, enter by barcode manually and check 'Enter by itemnumber"
17 - Click add items, no items should be added
18 - Repopulate form with barcodes, check 'Enter by barcode'
19 - Click add items, items should be added correctly
20 - Test various combinations of radio buttons and numbers and using form or not

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

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-11-10 09:47:09 +13:00
Liz Rea 24613ec9a5 Fixing updatedatabase after 3.18 2015-11-09 09:19:50 +13:00
Liz Rea d533076c38 Update release notes for 3.18.12 release
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-11-02 12:27:30 +13:00
Liz Rea e6984cf2a2 Increment version for 3.18.12 release
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-11-02 12:16:06 +13:00
Bernardo Gonzalez Kriegel 7bb9088ce2 Translation updates for Koha 3.18.12 release 2015-10-30 11:15:41 -03:00
Magnus Enger ecf0610705 Bug 15042: Barcode hbyymmincr does not work when receiving serials
To test:
- Set autoBarcode = <branchcode>yymm0001
- Make sure you have a serial that is set to "create an item record
  when receiving this serial"
- Receive an issue
- Click in the barcode field - nothing happens
- Apply patch and reload page
- Receive an issue
- Click in the barcode field - a barcode conforming to the
  hbyymmincr setting appears

Patch works as advertised.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 55127d50fb)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2067f59876)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 12:05:45 +13:00
Jonathan Druart 4a3f5c4797 Bug 15012: use sudo instead of su in koha-shell
Not sure this is the best way to fix it but it looks to work.

Test plan:
  sudo koha-shell kohadev
should not return any error
Without this patch, you should get
  bash: cannot set terminal process group (-1): Inappropriate ioctl for device
  bash: no job control in this shell

Confirm that other options work as before

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Works as expected. Tested on kohadevbox:ansible.
KOHA_CONF and PERL5LIB are correctly set on the child shell.
Bonus point: koha-shell doesn't die if the user issues Ctrl+C to abort an execution.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 0e9e51db94)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit fb546fa7ac)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 12:02:36 +13:00
Fridolin Somers 3363aa6228 Bug 14154: 608$9 defined twice in UNIMARC biblio-koha-indexdefs.xml
In DOM config file :
etc/zebradb/marc_defs/unimarc/biblios/biblio-koha-indexdefs.xml, the 608$9 is
defined a second time instead of 610$9.  Just a type I think.

Test plan :
- Apply patch
- Install a UNIMARC + DOM instance
- Define in a framework 610 using a thesaurus
- Create a new biblio
- Create a new authority (same type as the thesaurus defined above)
- Index : rebuild_zebra.pl -a -b -x -z
- Link the field 610 to the new authority
- Index : rebuild_zebra.pl -a -b -x -z
- In authorities search, search for the new authority
=> You see Use in 1 Records(s)

Signed-off-by: Frederic Demians <f.demians@tamil.fr>
  I confirm the typo.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit aaf3ff3fec)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 28940870e2)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 12:01:29 +13:00
Jonathan Druart d08be44641 Bug 15029: Make the IssueSlip tests pass even if launched after 23:00
Prior to this patch, the tests did not pass if they were launched after
23:00.
DateTime complains if you ask for creating a date with hour => 24 (which
is logical so far).

Test plan:
0/ Don't apply this patch
1/ sudo date -s "2015-10-19 23:50:00";prove
t/db_dependent/Members/IssueSlip.t
2/ Apply this patch and repeat 1.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 00a4e802ed)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 719f116ac9)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:51:14 +13:00
Kyle M Hall 67a3dc23f4 Bug 14937: Expiration date for holds based onReservesMaxPickUpDelay should not require ExpireReservesMaxPickUpDelay
C4::Letters::_parseletter will replace reserves.expirationdate with the
date a hold will be marked as problematic ( holds over ) if both
ReservesMaxPickUpDelay and ExpireReservesMaxPickUpDelay are enabled.
There is no reason this feature needs to rely on
ExpireReservesMaxPickUpDelay as there are many libraries that would like
to send the last day to pick up a hold in notices, but would rather deal
with the expired waiting holds manually rather than have Koha cancel
them automatically.

Test Plan:
1) Apply this patch
2) Set ReservesMaxPickUpDelay to 7
3) Disable ExpireReservesMaxPickUpDelay
4) Add reserves.expirationdate to your HOLD notice
5) Fill a hold for a patron
6) View the message, not that reserves.expirationdate is replaced
   with the date the hold will be marked as problematic

Signed-off-by: Karl Holton <kholten@switchinc.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 c6d0202569)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
(cherry picked from commit 77aedf1f7f)
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
2015-10-30 11:50:02 +13:00
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