Commit graph

14820 commits

Author SHA1 Message Date
Chris Cormack
d03148a717 Bumping database version 2011-10-09 20:15:35 +13:00
Robin Sheat
85b1d6d558 Bug 6636 - add 'powered by Koha' text to OPAC footer
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  QA control: added () inside 2 [% IF %]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 20:13:09 +13:00
de728937a8 Fix for Bug 6689 - Improve styling of table pager
Adds some style to the table pager include. Also
styles the pages "1/2" input field so that it
does not look like an input field (since editing
the value does nothing).

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 20:10:46 +13:00
78e0754bfc Fix for Bug 6616 - Move common table pager markup to include
Created new include for the tablesorter pager markup:

[% INCLUDE 'table-pager.inc' perpage='20' %]

'perpage' variable defines the default items per page for
the paged table.

Unique changes in branch_transfer_limits.tt:

- Moved tablesorter configuration out of a loop and changed
  it to work by class instead of id (less repeated markup).
- Corrected an errant TMPL tag.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 20:07:35 +13:00
Srdjan Jankovic
8b65b94636 Bug 6405: added enumchron to reserve copy list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 20:01:24 +13:00
Chris Cormack
ed73fb53ca Database version bumped 2011-10-09 19:53:31 +13:00
Ian Walls
7d8c805ef4 Enh 6403 DB changes: add RecordLocalUseOnReturn syspref
This patch, separate from the main functionality patch, adds the new syspref to the sysprefs.sql
as well as updatedatabase.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 19:51:19 +13:00
Ian Walls
e05d53d50d Enh 6403: Record local use stats when checking in unissued materials
Adds a new system preference, RecordLocalUseOnReturn, which when active will change the statistical
entry type from "return" to "localuse" in AddReturn() if the material was not on loan when returned.
The intended use-case here is for libraries with 'open' book drops, in which patrons can put locally
used (but unissued) materials.

Adds a small message to the user interface to confirm that Local Use was recorded.

This change opens up the possibility to record more types of statistics on return; one would just need
to update the $stat_type variable accordingly.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 19:50:41 +13:00
f7387f27da Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
F. Capovila patch ported to TT.

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>
2011-10-09 19:42:48 +13:00
7d599afe6d Bug 6371 Item Types description not properly displayed if not pure ASCII
In several places, C4::ItemType module is used to retrieve item types
and their description. If the description text contains non-ASCII
characters, those characters are not properly displayed.

This bug can be seen in:

  - 4xx plugin of a UNIMARC DB
  - Home > Admin > Item circulation alerts
  - others?...

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
  - Fixes display probems in circulation alerts and 4xx UNIMARC plugin
  - display in other places looks ok with and without patch

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-08 20:10:29 +13:00
Nicole C. Engard
433d70d3eb Bug 6966 Lists help file
This updates the lists help file.
2011-10-08 20:01:18 +13:00
Nicole C. Engard
84a13ac022 Bug 6966 Update tools help files
This updates the tools help files.
2011-10-08 20:01:16 +13:00
Nicole C. Engard
4ab2ab51f5 Bug 6966 Tag help file
This patch updates the tag moderation help file.
2011-10-08 20:01:15 +13:00
Nicole C. Engard
a22ae10491 Bug 6966 Suggestion Help Files
This patch updates the suggestion help file.
2011-10-08 20:01:14 +13:00
Nicole C. Engard
4b29162ddf Bug 6966 add missing routing lists help
This patch adds the missing routing list help file to
the serials folder.
2011-10-08 20:01:13 +13:00
Nicole C. Engard
4cc50cc3b4 Bug 6966 Update Serials Help
This patch updates the serials help files.
2011-10-08 20:01:12 +13:00
Nicole C. Engard
549ca98de9 Bug 6966 Comments Help
Updates the help file in the reviews folder.
2011-10-08 20:01:10 +13:00
Nicole C. Engard
be0e2efc10 Bug 6966 Holds Help
Update file in the reserve folder.
2011-10-08 20:01:09 +13:00
Nicole C. Engard
c44892d318 Bug 6966 Reports Help
This patch updates all the help files in the reports
folder and adds links to the manual pages.
2011-10-08 20:01:08 +13:00
Nicole C. Engard
6780d5d03d Bug 6966 Patron Card Help Files
This patch adds links to the manual to files in the
patroncards folder.
2011-10-08 20:01:07 +13:00
Nicole C. Engard
f5121f851a Bug 6966: Offline Circ Help
This patch adds the manual link to the offline circ help.
2011-10-08 20:01:07 +13:00
Nicole C. Engard
4f9faf4509 Bug 6966: Members Help Files
This patch updates the members help files. It removes
an unused file and adds a new one for the partial fines
payments. It also adds links to the manuals to all pages.
2011-10-08 20:01:05 +13:00
Nicole C. Engard
b143ed1054 Bug 6966 update help files for labels
This patch adds the manual links to the label maker
help files.
2011-10-08 20:01:05 +13:00
Nicole C. Engard
f33518e61e bug 6966 update help files
This patch updates help files not in a module specific folder.
2011-10-08 20:01:04 +13:00
Nicole C. Engard
86d9496c26 Bug 6966: Export help files
This adds the manual link to the export help file.
2011-10-08 20:01:03 +13:00
Nicole C. Engard
ab55e630a8 Bug 6966: Circulation Help Files
This patch updates the help files in the circ folder.
It also adds links to manual pages where needed.
2011-10-08 20:01:01 +13:00
Nicole C. Engard
0f6e7d5eb4 Bug 6966 Cataloging Help Files
This patch updates the help files in the cataloging folder.
It adds one missing help file and adds links to the manual
and updates to the others.
2011-10-08 20:00:56 +13:00
Nicole C. Engard
d97ae8830e Bug 6966 Authorities Help Files
This patch updates help files in the authorities folder. It
adds links to the manual for all files that weren't edit in
patches for bug 6942.
2011-10-08 20:00:55 +13:00
Nicole C. Engard
70b17c022e Bug 6966 Catalogue Help Files
This patch updates the help files in the catalogue folder
by including the link to the manual.
2011-10-08 20:00:53 +13:00
Nicole C. Engard
4e65e26bab Bug 6966 Acquisitions help files
This patch updates help files in the acqui folder. It removes
a file that isn't used anymore and adds links to the manual
for all files that weren't edit in patches for bug 6942.
2011-10-08 20:00:52 +13:00
Nicole C. Engard
72f98b94d6 Bug 6966: Admin Help Files
This patch updates help files in the admin folder. It removes
two files that aren't used anymore and adds links to the manual
for all files that weren't edit in patches for bug 6942.
2011-10-08 20:00:48 +13:00
Ian Walls
f56dc79754 Bug 6959: can't import record via Z39.50 from MARC edit page
JS to call Z39.50 popup wasn't updated to reflect the change ID values, so the frameworkcode passed was
"undefined" instead of "Default"

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-08 19:58:09 +13:00
77d69d1beb Fix for Bug 4223 - Too much serials info - design work needed
This patch reimplements the changes suggested in the original
patch. It puts each main section of the display into its own
tab.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-08 19:52:56 +13:00
Jonathan Druart
cfe8b6bd9a Bug 6048: printoverdues.sh bash odities
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>

Note: this script really needs a rewrite, but this patch does fix up the
things it's supposed to fix up.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 14:14:53 +13:00
cd1fbb7510 6786: False detection of index names in Search; make index names case insensitive
Fixing the regex to detect index names in ccl queries.  Changing loop
structure: looping through the index candidates in the query is faster than
testing every index name with a regex.  Making the index comparison case
insensitive will benefit users misspelling the case of an index; Zebra does not
care about it.  Test the change by searching on a word followed by a : or =
character.  Previously, when that word contained an index name like an or nb,
the search would crash.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>

Perltidied the new block to fix indentation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 14:08:09 +13:00
293a9baba8 6769 Getting rid of some RIS errors/warnings
Removing unnecessary warnings. Some were based on errors in the script. Others are removed by adding debug flag and disabling debugging mode by default.
Adding carriage returns for Windows users, assuming that it does not hurt the Linux users. (Perhaps a future option?)
Test it with: http://yourserver.com/cgi-bin/koha/opac-export.pl?bib=yourbibnumber&format=ris&op=export [replace server and biblionumber]

Revision of Aug 24: Fixed two missing newlines too.

Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
  (removed comment "240811 marcelr during QA"

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 14:02:34 +13:00
f02796d989 6584: Enable searching on Zebra's Bib-level index
Bib-level is already indexed in MARC21 record.abs.
But you cannot search this index, because it is commented in ccl.properties and
not listed in getIndexes of Search.pm.
This very simple patch does only do those two things.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 13:43:47 +13:00
Magnus Enger
c7b77c789e Bug 6953 - Value builder for NORMARC 007 does not show further options
A previous commit introduced a missing TT control structure, but
forgot to include the trailing "\" for multiline JavaScript.
This patch simply adds the missing "\".

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 12:03:41 +13:00
6ade95d5db Fix for Bug 6600, Library name linking wrong if current location is different
GetItemsInfo in Items.pm includes this join:

LEFT JOIN branches ON items.homebranch = branches.branchcode

This means that the branch URL (from the branches table) comes out
as the URL for items.homebranch, thus the URL in the holdings
output is the item's home branch even though the display might
be showing a different current location.

This patch changes the join to use items.holdingbranch. The join
was originally added to fix Bug 3702, and based on the description
of that feature I'm assuming this change is not harmful to other
usages. However, it does make the assumption that the item's
current (holding) branch is the branch we want to see information
about.

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 11:34:43 +13:00
Paul Poulain
1e16c7cbab BZ6268 follow-up for the form
This follow up fixes cait request to calculate the form like the budget

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 11:00:07 +13:00
Paul Poulain
0d0b3ef9c2 Bug 6268: (MT #6408) Bad Total in basket.pl
The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
But in the budget this amount is the summ of discounts computed for each line.
Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 10:59:06 +13:00
Jonathan Druart
1f0e3d7a4b Bug 6076: acqui pdf error when marcxml wrong
when marcxml is wrong the PDF is not generated. There is a Perl error
because
the biblio can't be retrieved.
This can be workarounded with a eval when decoding the marc

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 10:20:13 +13:00
Paul Poulain
b5a3f485ab BZ6074: setting import flag when staged file imported in aqbasket
Lines issued from a staged file have a flag that can be set when the order has
been added in a basket. It's set when a staged file is imported into the
catalogue, it should be set also when a record is inserted through aquisition.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Add order from staged file to a new basket
- Add single order from one item
- Import rest using the bulk feature
- Staged file will no longer be shown after all titles
  have been ordered and import_status in import_batches
  is correctly  set to 'imported'

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 10:08:41 +13:00
Srdjan Jankovic
4c1ea37e63 bug_6974: bugfix: do not create empty record before building input for new biblio
It messes up javascript default values

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 09:59:45 +13:00
Chris Cormack
873091dcc8 Bug 6958 : Fix for leading spaces being stripped on translation
This will re-add any leading spaces, so formatting is not messed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
- all examples from the bug report are fixed now
- verified system preferences are still translated
- verified xslt displays are still translated
- verified javascript alerts are still translated
- verified switching languages works

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-10-07 09:42:13 +13:00
Srdjan Jankovic
d388acd482 bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-07 09:21:15 +13:00
Ian Walls
38f4c5264d Bug 6975: OPACBaseurl instead of OPACBaseURL
Updates OPAC templates to refer to OPACBaseURL (the properly capitalized name) instead
of OPACBaseurl

Also fixes some T:T scope errors when OPACBaseURL was called within a loop

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-06 14:39:04 +13:00
D Ruth Bavousett
b1e6aadf56 Bug 6867: Date last seen ignored on import
The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-05 09:57:59 +13:00
Robin Sheat
1d89ab22c9 Bug 6937 - change "Fines" to "Fees & Charges" on circ page
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-04 09:20:57 +13:00
Chris Cormack
481f620455 Merge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster 2011-10-04 08:56:56 +13:00