Commit Graph

16254 Commits

Author SHA1 Message Date
Frédéric Demians ee3ffc006c Bug 8062 [SIGNED-OFF] Perl module dependency Template::Plugin::HtmlToText
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 22:06:31 +12:00
Frédéric Demians 39017da1f5 Bug 8062 [SIGNED-OFF] Cart email broken for non english templates
Fix basket email sent from OPAC. The email body is now generated HTML
(to be translatable), and converted into TEXT before beeing sent by
email.

To test that it works in other language than English, you have to update
your language .po file:

  perl translate update de-DE

Then, translated strings coming from opac-sendbasket.tt, and install the
translation:

  perl translate install de-DE

New dependency: Template::Plugin::HtmlToText

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 22:05:42 +12:00
Chris Cormack 4f6cae7589 Bumping database version 2012-06-10 22:01:05 +12:00
Kyle M Hall 08e57b52a8 Bug 7951 - Suspending holds needs a system preference
Adds system preferences SuspendHoldsIntranet and SuspendHoldsOpac.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Conflicts:

	installer/data/mysql/sysprefs.sql

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:58:28 +12:00
Frédéric Demians a3d0cd2378 Bug 6267: [SIGNED-OFF]Fix a typo
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:38:52 +12:00
Jonathan Druart 746d5e8bdc Bug 8119 - Followup Show hint when disabling active currency checkbox
Display the message on editing

Signed-off-by: Shari Perkins <dear.shari+koha@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:22:53 +12:00
Owen Leonard fa1d790870 Bug 8119 - Show hint when disabling active currency checkbox
Display a hint when the exchange rate != 1.0: "The active currency
must have a rate of 1.0"

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Shari Perkins <dear.shari+koha@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:22:27 +12:00
Jonathan Druart 2816354d78 Bug 8195: Selected link must be bold (in admin and tools)
For several links, the selected entry is not bold, try with these pages:

admin/smart-rules.pl
admin/biblio_framework.pl
tools/export.pl

This patch fixes this behaviour

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:18:48 +12:00
Srdjan 1c7cc6f49b bug_8138: added 773$t field to search results
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-10 21:10:38 +12:00
Colin Campbell a208e8445b Bug 8176 [SIGNED-OFF] Assign an intial value to $sqlwhere
warnings in log because of undefined value in
string concatenation
variable should be initialized to empty string rather
than left undefined

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Removes a warning in logs

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 17:36:39 +12:00
Owen Leonard 90d69b469d Bug 8161 - Cataloging home page should be accessible to users with permission to edit catalog or edit items
This patch modifies the permissions required to access the cataloging
home page (addbooks.pl) so that the user requires edit_catalogue,
edit_items, or fast_cataloging permission.

Users with only edit_catalogue permission will only see biblio edit
links. Users with edit_items permission will only see item edit
links. Users with fast_cataloging permission will only be able to
view information about contents of the catalog--useless for them
but I'm not sure how better to handle it.

To test, log in as a user with each of the above permissions
enabled separately and in combination and test access.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 17:33:51 +12:00
Colin Campbell a0c9c30352 Bug 3638 : Captured Holds may need to generate a transfer
If a discharged item is captured for a hold at another branch
the selfcheck should generate a branchtransfer for it.
This was complicated as the checkin routine was setting its own
location from a field not set in many scm machines (e.g. 3M)
also in ILS::Transaction the test for location was incorrect
assuming that an empty string or undefined was a valid location

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 16:58:48 +12:00
Colin Campbell b7ef3d4c2f Bug 3638 Self Check Should Capture Hold Items
Shelf Check was receiving messages saying item was wanted
for a hold but the item was discharged to the shelf
not associated with the hold or transited to
the pickup location. The message was also being sent
on discharge of items when a suitable item had already
been captured.
Checkin now associates the item with the hold and sets
the appropriate data for a correct checkin response

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 16:56:33 +12:00
Chris Cormack 03bf55aeb8 Bug 5327 : Fix for XISBN test, thingisbn is now handing back different results 2012-06-06 08:58:03 +12:00
Paul Poulain 9f6983ed3f Bug 8182 follow-up, fixing BLO typo mistake
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 08:22:39 +12:00
Kyle M Hall 220b3d6c9c Bug 8182 - Problem with overdue fine calculations after upgrade
Items that were overdue and still out as of 5/26 (date of Upgrade) were charged
overdue fines as of 5/26.  When the items DO come back, the overdue fines are
calculated again from the due date to the date of checkin.  Therefore the
patron is being charged double overdue fines from the original date up to 5/26.

This is caused by issues.date_due being changed to a datetime, with the
hour/minute/secons time portion defaulting to 00:00:00. It should be 23::50::00 instead.

This is an unusual patch as it modifies a previous database update. This
make sense because if a install has already been updated past the db rev
update, this fix will be too late. It will only help those that have not
updated past that db revision.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 08:01:12 +12:00
Owen Leonard 79a4a67a0f Bug 8160 - Link to cataloging appears for users without cataloging permission
This patch wraps cataloging links on the staff client home
page and in the header menu with checks for edit_catalogue
OR edit_items permission.

To test, access the staff client as a user with various
permissions. The "cataloging" link on the main page and
in the header menu should only appear to a user with
edit_catalogue permission, edit_items permission, or both.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 07:48:38 +12:00
Chris Cormack b586525d55 Bug 8082: Fixing circulation.pref to match reality for IssuingInProcess
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, changes are as advertised.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 07:43:22 +12:00
Paul Poulain 1629e8eb39 Welcome to Piotr Kowalski, that is 183th
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 03:43:43 +12:00
Piotr Kowalski 30865f7257 Bug 8116 : Fixing warn in error log
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 03:41:49 +12:00
Owen Leonard e357a313c9 Bug 8111 - Language chooser display problem in self-checkout
- Adds required JavaScript and JavaScript linked files
- Updates CSS with changes relevant to this feature which had
  been made to the main CSS file.
- Removes an image file which has been made obsolete now that
  sco.css uses the main image sprite like opac.css does.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 03:25:57 +12:00
Jared Camins-Esakov c97e0c7673 Bug 7847: OPAC search dies with Plack
Due to a dependency cycle between C4::Search and C4::Items, searches
in the OPAC die spectacularly under Plack. This counter-patch extends
dpavlin's solution and replaces use with require for C4::Search in
C4::Items and for C4::Items in C4::Search.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 03:15:20 +12:00
Owen Leonard 3168ada7f0 Bug 7599 - [SIGNED-OFF] Cart JavaScript contains untranslatable English strings
To simplify the sentence structure for better translation flexibility
the message now reads:

"Item in your cart: " + number

Fixed in both OPAC and staff client, although I'm not sure
the message is actually triggered in the staff client.

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

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 03:05:18 +12:00
Liz Rea 5721f183ee Bug 8129 - Quickslips not printing
Implemented from the suggestions attached to the bug.

To test:
Check out a book to a patron
Click print -> quick slip

Slip should show only today's checkouts.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-06 02:57:49 +12:00
Kyle M Hall 36bd03b016 Bug 8140 - [SIGNED-OFF] Error when exporting label xml
It appears that the name of a variable was changed,
but the declaration of said variable was not.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-06-02 07:54:15 +12:00
Chris Cormack c10b2dc3d5 Bug 4330 : Adding copyright headers and fixing FSF addresses
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:52:19 +12:00
Chris Cormack 3ab76301d5 Bug 4330 : Fixing FSF address and copyright headers for acqui/
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:51:59 +12:00
Chris Cormack fe4d5e5cb8 Bug 4330 : Adding missing license statement
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:29 +12:00
Chris Cormack 71928871ca Bug 4330 Fixing FSF statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:16 +12:00
Chris Cormack dc8a0375ec Bug 4330 : Fixing FSF address and copyright statements
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:50:05 +12:00
Chris Cormack b8b622ac17 Bug 4330 : Fixing FSF address and copyright headers
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:49:53 +12:00
Owen Leonard 50c9b9f787 Bug 7127 - Templates must be valid XHTML
Fixing markup errors on OPAC detail page and OPAC results.
Also conditionally including ratings JS on OPAC detail.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:46:52 +12:00
Paul Poulain 7b0c896d76 Bug 8144 - 775 tag in the MARC record causes display issue
Fixing XSL template in the OPAC and staff client following
recommendations by Jared.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixes the markup and correctly displays 775 notes.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:41:06 +12:00
Mason James 480c367914 Bug 8145 - [SIGNED-OFF] opac-tags.pl fails when DEBUG is set
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:32:26 +12:00
Matthias Meusburger 484f4a9998 Bug 6858: Bug fixing, fix some errors with the staticfines.pl script
This new patch :

  - Fixes calculation bugs
  - Removes -o option for logs (which wasn't working anyway)
  - Adds a --borrower <borrowernumber> option for applying the fine only to one given borrower

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:27:36 +12:00
Colin Campbell df5a7a27c3 Bug 8150 [SIGNED-OFF] Remove obsoleted navigation bar in circ history
The navigation bar is now supplied by the datatables plugin
however we are still calling the old navigation include
resulting in a second navigation bar which does nor work

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, without introducing any bad side effects that
I can see.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:18:27 +12:00
Jonathan Druart f8d315acb1 Bug 8122 - Followup Add a link to new library group creation from empty groups message
Set outside tables the "no group defined" message.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 16:02:10 +12:00
Owen Leonard 1f8f1d01c1 Bug 8122 - Add a link to new library group creation from empty groups message
When there are no groups, add a link to group creation from
the message, "No properties defined."

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 15:58:06 +12:00
Srdjan a5c185fd53 bug_8056: sorted out slip print calls
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
preference works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Tested that CircAutoPrintQuickSlip clear the screen still works well

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 08:57:25 +12:00
Owen Leonard da201ee7e4 Bug 8014 - On the patron entry form hide "restricted until" field if "Restricted: No" is checked
This patch adds JavaScript to automatically hide the "Restricted
unil" form field on the patron entry form if "Restricted: No" is
selected. If "Restricted: Yes" is chosen the "Until:" field
is shown and focus is given to it.

The patch also adds a note, "(optional)" after the "Until:" field
to make it clearer that a date is not required.

To test, open a patron record and try moving the selection
between "Restricted: No" and "Restricted: Yes." Confirm that
the "Until:" field is shown and hidden as expected. Confirm
that the restricted flag is correctly set or unset upon save,
including setting the flag with or without a date.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 08:43:12 +12:00
Paul Poulain 5c2ba44c38 Welcome to the 182th commiter !
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 00:36:10 +12:00
Simon Story 366f3611ae Bug 6684: Fixes to koha-remove
Fixes bugs 6684 6997 4880:
6684 koha-remove should check the number of arguments it gets
6997 koha-remove leaves system in inconsistent state if there is an error
4880 koha-remove sometimes fails because user is logged in

Amended by chrisc@catalyst.net.nz
Trying to resolve conflicts.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Rebased on top of bug 7924.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-29 00:32:50 +12:00
Katrin Fischer 8947b6e8a5 Bug 7926: Acq search results show empty () for orders without basket group
To test:
- search for orders by title or vendor
- make sure some results are attached to a basket group, while others are not
- make sure correct information shows in the basket group column of search results

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

- Fixed merge conflict

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:22:53 +12:00
Kyle M Hall a47cdad201 Bug 8080 - login and password is pre-filled by the browser when creating a new patron
When creating a new patron, if you have chosen to let your browser remember your
login and password for you, the login and password fields will be pre-filled with
them, leading to a systematic error "the passwords entered do not match" since
the second password field was not filled. These fields should be blank.

Add the directive autocomplete="off" to the memberentry form tags.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes t xt
enhances usability of password forms, gets my signoff.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:11:47 +12:00
Owen Leonard 9e6c5fb5ca Bug 8107 - Disabled buttons not distinguishable from enabled buttons
Add a "greyed-out" style for disabled buttons.

Having looked through the templates for examples of usage of this
I'm not convinced that we should really be showing disabled buttons.
I think in general it would be better to hide or show a button
based on whether the action is available.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

I agree, I think hiding or showing is better, but this patch is
harmless enough, until we want to go fixing our usage

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 22:09:01 +12:00
Stéphane Delaune beb43aa6ef Bug 8040: bad name in acquisitions-menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 21:56:02 +12:00
Chris Cormack df2d02a0d3 Bug 5795 : Updating version number 2012-05-28 21:46:24 +12:00
Amit Gupta a8a1623333 Bug 5795 Update the database as follow-up If sys pref
ReservesControlBranch has null then update the table to
insert a PatronLibrary as value

To Test:
1) Go to mysql use koha database
2) select * from systempreferences where variable = 'ReservesControlBranch'; Check if value set to ItemHomeLibrary.
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| variable              | value           | options                       | explanation                                     | type   |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+
| ReservesControlBranch | PatronLibrary   | ItemHomeLibrary|PatronLibrary | Branch checked for members reservations rights. | Choice |
+-----------------------+-----------------+-------------------------------+-------------------------------------------------+--------+

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Conflicts:

	installer/data/mysql/updatedatabase.pl

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

Fixed for 3.8.x
2012-05-28 21:44:04 +12:00
Katrin Fischer f4df63b153 Bug 5795 [SIGNED-OFF] - Missing ReservesControlBranch system pref in database installer
sysprefs.sql file was missing ReservesControlBranch.

To test:
1) Create a new installation and check sysprefs.sql loads correctly.
2) Check ReservesControlBranch shows up correctly in the sys pref editor.
3) Check sys pref can be edited and new value saves correctly.

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

- Line is added at the end of installer/data/mysql/sysprefs.sql
- Tested Line diretly in MySQL with a systempreferences table where variable 'ReservesControlBranch' was missing. Data inserted correctly.
- Syspref shows up in Staff client

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

- Fixed merge conflict

Conflicts:

	installer/data/mysql/sysprefs.sql

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

- Tidied for 3.8.x
2012-05-28 21:40:44 +12:00
Owen Leonard 98e0ecf355 Bug 8124 - Hide option to download results of items with no checkouts report
We should not show disabled controls for features which don't work.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-05-28 21:33:47 +12:00