Commit graph

4498 commits

Author SHA1 Message Date
Chris Cormack
2b25835464 Merge remote branch 'katrin/3381_intranetusercss' into new/enh/bug_3381
Conflicts:
	installer/data/mysql/it-IT/necessari/sysprefs.sql
	kohaversion.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-14 12:24:59 +13:00
Chris Cormack
5278aa0ca4 Merge remote branch 'kc/new/biblibre_reports' into kcmaster 2010-12-14 06:31:00 +13:00
Nicole Engard
1b36fafe8c bug 5150 change issuing to circ & fine rules
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 23:10:49 +13:00
Chris Cormack
9cce6deef8 Merge remote branch 'kc/new/bug_4218' into kcmaster 2010-12-13 22:55:23 +13:00
bd26d05628 Bug 4218: Fixes display problem introduced by last patch
Adds back missing <!-- /TMPL_IF -->.
Without navigation tabs and holdigns are not displayed in staff detail.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 22:54:12 +13:00
2b53b14bac Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 22:14:19 +13:00
554b6ad340 Fix for Bug 5416, Template syntax error in moredetails.tmpl
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 21:21:13 +13:00
565b780bec Bug 5041 Allow to delete non-repeatable field
Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 20:13:52 +13:00
Chris Cormack
906a1a03ac Merge remote branch 'kc/new/enh/bug_1997' into kcmaster 2010-12-13 20:04:11 +13:00
Katrin Fischer
c6a9141413 Bug 3381 - Add an IntranetUserCSS system preference
Add an IntranetUserCSS sys pref that works like OPACUserCSS in OPAC only for intranet.
2010-12-13 08:01:41 +01:00
Chris Cormack
c49dc072aa Merge branch 'new/bug_4218' into kcmaster 2010-12-13 15:57:17 +13:00
6466ac847f Fix for Bug 4218 - Staff client detail page does not show item hold status
Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 15:56:11 +13:00
Alex Arnaud
122bc589e7 (BUG #4806) circ/circulation.tmpl: Add "reservenumber" in the reserved table.
Add "reservenumber" the "reserved" table which is used for delete or update reserved items.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 14:30:59 +13:00
Nicole Engard
817b133838 Bug 1997: new OPACNoResultsFound pref
This patch adds a new preference to allow librarians to
add content to the no results found page if they want.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changed surrounding <p> in template to <div id="noresultsfound">
Will send follow up patch adding sys pref to translated sql files
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 10:20:51 +13:00
Nicole Engard
d0231ba65c Bug 5483 New Icon Set
Icon set sponsored by the Allen Ginsberg Library
at Naropa University sponsored this icon set
named Seshat, after the Egyptian goddess
of libraries, and designed by Jen Tobias.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 10:09:32 +13:00
9a15aa4514 Fix for Bug 1883, authorised list of reasons why patron requesting book
- Adding form controls to opac submission form and staf client
  edit form.
- Adding display of patron reason for suggestion on opac list
- Adding function for pulling an authorized value description
  using the category and value

TODO: Add some default authorised values

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:55:29 +13:00
bdf4dd13af Fix for Bug 4173 - Statuses not appearing in the OPAC
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:51:15 +13:00
cb969684da Fix for Bug 5285, Show/hide columns in the output of items in batch operations
Also adds title/author information to output of batch deletions

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:45:30 +13:00
Amit Gupta
f164902761 Bug 5464 Suggestions - adding more acq fields to staff interface
More acq fields in staff interface - price, quantity, currency and totals

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-13 09:22:05 +13:00
Koustubha Kale
e4cbc4f421 Bug 5418: Rev-5 patch new itemBarcodeInputFilter for libsuite8 style barcodes
In India a ILS product called Libsuite8 prints barcodes like b0007432. The barcode is not stored anywhere in libsuite8's database. Neither is barcode available in any of the reports generated by the software.

The barcode 'b0007432' when scanned into the libsuite8 software is de-constructed like 'b' which is the itemtype i.e. Book in this instance, and '7432' which is the 'Accession Number'. The software then takes the logged in staff's branchcode and does a join on three tables 'Location', 'Media_Type', and 'Books' to retrieve the particular record from the database.

There is no possibility of recreating the barcodes for insertion in Koha while doing a retrospective conversion, because of arbitrary length of the barcode string AND arbitrary number of zeros in the numeric part of the printed barcode AND the fact that there are no reports available from the software which contain barcodes AND the fact that the barcode is not stored in the database.
But most importantly due to the simple fact that printed barcodes are duplicated among branches.

Therefore this patch emulates the functionality of Libsuite8 software of converting the scanned barcode into one stored in Koha using the itemBarcodeInputFilter system preference.

To use this new itemBarcodeInputFilter systempreference choice called 'libsuite8', the barcodes stored in Koha must match the pattern of <branchcode>-<itemtype_code>-<accession_number>. This is easy to achieve while doing retrospective conversion from Libsuite8 to Koha.

As expected the itemBarcodeInputFilter will return unmodified barcode if presented with a barcode of pattern <branchcode>-<itemtype_code>-<accession_number>

This revision corrects the way updatedatabase.pl is changed in order to correctly update version and insert the libsuite8 option in the database. Also kohaversion.pl is changed in the recommended format of 3.0X.0X.XXX to reflect database has changed.

This revision also changes the erronorous itemBarcodeInputFilter description in koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref from 'scanned patron barcodes' to 'scanned item barcodes' there by eliminating need for a separate patch for bug 5417.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>

1) applied patch to HEAD
2) set next database number in kohaversion.pl and updatedatabase.pl
3) webinstaller kicked in, update ok
4) typed the barcodes from test cases into check-in

Barcodes used my local branch code, everything seemed ok to me.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:39:20 +13:00
e29a123a9b Fix for Bug 2808, Hold queue not alphabetizing
White space in the biblio-default-view include and in the page
template caused sorting on title or patron to be incorrect.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:30:06 +13:00
Jean-André Santoni
fefd158f42 Ergonomy improvement in smart rule management
Added a jQuery table filter, usefull when you have a lot of rows. This filter works on the entire row and allows you for exemple to type "Adul Perio 5".
Indentation cleaning.
Added tabs to filter colums on 4 axes: All, Issues, Fines and Reserves.
Moved the table filter to the right of the tabs.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:23:18 +13:00
Colin Campbell
aa6ce934d9 Bug 5022 Supplements were not saved correctly
No subscription id was set
Also entered a default arrived date on the supplement
And removed errors due to bad dates returned from GetSerials

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 20:13:59 +13:00
c9f3f2872f Fix for 4832 - Re-editing a suggestion changes the item type
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 08:00:44 +13:00
5633b423e3 Bug 5467: Kits shown wrong as visual material in XSLT displays
- reused icon for mixed materials for kits
- fixed missing icon for mixed materials

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 07:53:50 +13:00
f.demians at tamil.fr
76264638cc Bug 5446 Item creation in Acquisition module doesn't control mandatory field
Add some JS validing form, so saving an order is blocked if any item mandatory
field is empty.

Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
2010-12-12 07:50:27 +13:00
27828231d4 Add BSZ to Koha's About page
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-12 07:47:21 +13:00
e54169ba0f Incremental fix for Bug 3285 - Location on Add Subscription should be pull down
- Adds location dropdown to subscription edit form
- Pulls authorised value for display on subscription detail page
- Adds function for pulling authorised value description based
  on category and value

This patch does NOT implement automatic preselection of the shelving
location form field on the serial add item screen. This must be
worked out in order for the bug to be closed.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-07 09:29:05 +13:00
02524213b3 bug 5397: display renew count consistently
Display the renewal count for loans consistently; in particular,
for loans that have never been renewed, display 0.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:56:34 +13:00
Chris Cormack
b36befa821 Merge remote branch 'kc/new/enh/bug_4983' into kcmaster 2010-12-03 12:55:25 +13:00
05dd542ceb Fix for Bug 4983 - Add edit record / edit item links to search results
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:48:53 +13:00
e6ebf10bba Fix for Bug 4851 - Batch delete shouldn't show delete button if no items were found
- Adding template flag to indicate valid results (hidden or not)
 - Clarifying warning messages based on various outcomes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:47:12 +13:00
Katrin Fischer
eb2c10eff9 Bug 5104: Add control number as search option to acq z39.50 search
Adds control number as search option to z39.50 search in acquisitions.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-03 12:32:32 +13:00
1024eceec7 Fix for Bug 5048, Error in menu/submenu for select language in intranet
Patch for HEAD. This issue was apparently solved quite a while
ago in the OPAC. This patch copies that solution over to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:24:34 +13:00
Chris Cormack
00408e262f Merge remote branch 'kc/new/bug_5030' into kcmaster 2010-12-02 09:20:14 +13:00
9f0495238d Fix for Bug 5030 - Improve handling of duplicate patrons
- Making duplicate patron warning dialog simpler but more explicit
- Pointing duplicate patron preview window to new brief version
  of moremember.pl to display more patron details than the previous
  version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:16:07 +13:00
Chris Cormack
0287080cdc Merge remote branch 'kc/new/bug_5029' into kcmaster 2010-12-02 09:14:49 +13:00
f7b3b0c75b Fix for Bug 5029 - Update patron deletion error page
- Styling error message with "dialog alert" class
- Adding sidebar patron details to match other patron pages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:13:38 +13:00
9753368626 bug 5405: remove disused script catalogue/suggest.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:12:31 +13:00
470dc1d37c Further fixes for Bug 5142 - Untranslatable strings in tag review template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-02 09:02:53 +13:00
083d3b1a92 Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.

In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:38:43 +13:00
cc57c2688d Fix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time
This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-30 08:15:34 +13:00
7fd45b9861 bug 5127: sample notice templates for suggestions
* supply default suggestion status change email
  templates.
* remove the deprecated mail_suggestion_*.tmpl files

There are a couple suggestion statuses referred to
in the code and suggestion management page that currently
do not have notice templates defined: ASK and CHECKED.  These
seem to be internal, so perhaps default message templates
are not needed for these.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Chris Cormack
b1c2d560b6 Bug 4211: This patch should provide a working way to send out mail from suggestions
Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc

Squashed commit of the following:

commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:41:34 2010 +1200

    bug 4211 parsing the letter before we enqueue it

commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Aug 13 09:32:09 2010 +1200

    Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent

commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:36:26 2010 -0400

    Fix for Bug 4211, Acquisitions actions on suggestions don't generate email

    Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
    notices are added by hand (or from default sql--see Bug 5127) this
    correction should get suggestions notices properly enqueued.

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

commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard@myacpl.org>
Date:   Thu Aug 12 12:27:33 2010 -0400

    Fix for Bug 5126 - Suggestions module missing from "add notice" form

    - Adding "suggestions" entry
    - Re-ordering options in alphabetical order

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

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-11-30 06:47:52 +13:00
Katrin Fischer
703156daee Bug 5430: Add Control number as option to OPACSearchForTitleIn
Makes {CONTROLNUMBER} available as new placeholder in
system preference OPACSearchForTitleIn.

{CONTROLNUMBER} will be replaced by the number in tag 001.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-25 08:26:33 +13:00
Chris Cormack
e04be3a48c Merge remote branch 'kc/new/bug_5175' into kcmaster 2010-11-21 10:44:16 +13:00
Katrin Fischer
455c87d96e Bug 5175: Publisher link breaks display, if no publisher exists
If there is no publisher the empty publisher link will break the record display
in staff and intranet.

This patch adds a check for existence of subfield b.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-21 10:40:57 +13:00
Chris Cormack
0874050dc6 Merge remote branch 'kc/new/bug_5004' into kcmaster 2010-11-19 09:53:19 +13:00
a36a7e1e61 Fix for Bug 5004, Don't block deletion of cities when instances exist in borrowers table
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-19 09:28:33 +13:00
Chris Cormack
40bb99763d Bug 4440: Fixing template syntax errors 2010-11-18 15:29:04 +13:00