Commit graph

14794 commits

Author SHA1 Message Date
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
Ian Walls
37c48ccfb2 Bug 5236 Followup: items table information being keyed by biblionumber instead!
This patch fixes an error with bugfix 5236; any item-table information in the PREDUE letter
was being parsed with biblionumber as the key, instead of itemnumber.  Unless itemnumber == biblionumber,
this will ALWAYS return the wrong information.

I've moved the item table parsing line to within the if ($itemnumber) conditional check, and replaced
the key to use the itemnumber instead of the biblionumber.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-04 08:54:40 +13:00
Ian Walls
a291cc52ca Bug 6633: SCO return button doesn't work
A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-30 09:19:03 +13:00
Ian Walls
973371a68b Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.

This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')

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-09-28 20:29:39 +13:00
Chris Cormack
405ee6844d Updating history and about file 2011-09-28 09:53:34 +13:00
Chris Cormack
ed328807c3 Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster 2011-09-28 09:51:05 +13:00
Thatcher Rea
69dad7258b Bug 6871 - Have a link to the schema page on the reports page
Adds schema and reports library to reports-home.tt

To Test: Verify that schema and report library links are visible on reports-home.pl

Signed-off-by: Liz Rea <lrea@nekls.org>
Works as advertised, links are correct.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-28 09:49:42 +13:00
Liz Rea
085de44ebd Bug 6927-- Typo in C4::Overdues.pm
Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails

This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-28 09:24:17 +13:00
5d5c4a67ec Fix for Bug 6872 - Can't set default SMS messaging options for patron category
Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 21:35:41 +13:00
Chris Cormack
b9808b86df Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited 2011-09-27 11:14:06 +13:00
Ian Walls
26acaf3dfa Bug 6801: checkoverdues returns unnecessary fields, causing slowness
Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

Bug 6801: member details page taking long time to load when many checkouts present

This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.

Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).

Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].

Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 09:43:25 +13:00
Larry Baerveldt
d5a886201c Bug 4841: biblio-level itemtypes not searchable in advance search by itype
Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 08:38:35 +13:00
c9905750e5 Bug 6869 Batch item modification fails whit accented characters
Corrects a problem in batchMod.pl when accented characters are used.

When modifying multiple items in batchMod.pl, the batch modification
fails if accented characters are used in any of the fields of the
modification form.

This is a port of Frédérick Capovilla patch from 3.2 to 3.4 version

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 08:27:01 +13:00
Chris Cormack
944831555e Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-27 08:22:32 +13:00
05d9510ca9 Bug 6755 Followup setlanguagecookie used in 2 places
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-27 08:22:18 +13:00
Chris Cormack
cac6eb1250 Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-27 07:05:03 +13:00
Chris Cormack
c01fcbf973 Bug 6755 : Fixing a bug with guided reports 2011-09-27 07:04:02 +13:00
Chris Cormack
05be38d438 Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 23:27:20 +13:00
166f1668d8 Bug 6755 Web browser default lang != syspref selected langs
When Web browser default selected language doesn't belong to selected
languages list defined by syspref (language / opaclanguages), web pages
are returned in this language, which is wrong...

This patch get this behavior:

- If selected by user language is available (cookie), it is used.
- Otherwise, language is set to default web browser language.
- If this language doesn't belong to languages list (syspref),
  English is selected

Some code cleanup.

To test properly: don't forget to delete your cookies, and to test what
happens without and with cookie.
2011-09-26 23:26:09 +13:00
Chris Cormack
c5fe424c0f Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster 2011-09-26 23:14:36 +13:00
Chris Cormack
3bb33fd666 Bug 6755 Follow up, fixing broken call to themelanguage 2011-09-26 23:13:18 +13:00
Chris Cormack
592bced8ed Adding new developer to history 2011-09-26 14:40:13 +13:00
Janusz Kaczmarek
0d480bbf5c Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
A corrected version of the patch of 6 June 2011.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 14:32:32 +13:00
Chris Cormack
7244d5060b Fixing a broken test 2011-09-26 11:55:58 +13:00
Meenakshi.R
8b75f5b38c Bug:6781--Log membership renewal
If patron related logging is tuned on, log membership renewal

Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 11:30:27 +13:00
f640a3ea5f Bug 6649 Allow help screens editing
edithelp.pl hadn't been updated to allow help screen editing.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Only a note: Apparently you need to be 'superlibrarian' permission
to edit help pages.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-26 11:26:52 +13:00
e9673ea496 Fix for Bug 4298 - Title detail display: improve display of item level hold information
Message changed for two cases, waiting and item-level hold:

"Waiting for [ patron name ] at [ library] since [ date ]"

"Item-level hold for [ patron name ] for delivery at [ library ] (placed [ date ])"

Signed-off-by: Liz Rea <lrea@nekls.org>
Works as advertsed, is MUCH more clear.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-25 21:25:52 +13:00