]> git.koha-community.org Git - koha.git/log
koha.git
13 years agoBug 6371 Item Types description not properly displayed if not pure ASCII
Frédéric Demians [Thu, 19 May 2011 04:54:38 +0000 (06:54 +0200)]
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>
13 years agoBug 6966 Lists help file
Nicole C. Engard [Fri, 7 Oct 2011 19:36:05 +0000 (15:36 -0400)]
Bug 6966 Lists help file

This updates the lists help file.

13 years agoBug 6966 Update tools help files
Nicole C. Engard [Fri, 7 Oct 2011 19:30:37 +0000 (15:30 -0400)]
Bug 6966 Update tools help files

This updates the tools help files.

13 years agoBug 6966 Tag help file
Nicole C. Engard [Fri, 7 Oct 2011 18:14:48 +0000 (14:14 -0400)]
Bug 6966 Tag help file

This patch updates the tag moderation help file.

13 years agoBug 6966 Suggestion Help Files
Nicole C. Engard [Fri, 7 Oct 2011 18:11:41 +0000 (14:11 -0400)]
Bug 6966 Suggestion Help Files

This patch updates the suggestion help file.

13 years agoBug 6966 add missing routing lists help
Nicole C. Engard [Fri, 7 Oct 2011 18:04:43 +0000 (14:04 -0400)]
Bug 6966 add missing routing lists help

This patch adds the missing routing list help file to
the serials folder.

13 years agoBug 6966 Update Serials Help
Nicole C. Engard [Fri, 7 Oct 2011 18:01:03 +0000 (14:01 -0400)]
Bug 6966 Update Serials Help

This patch updates the serials help files.

13 years agoBug 6966 Comments Help
Nicole C. Engard [Fri, 7 Oct 2011 17:34:42 +0000 (13:34 -0400)]
Bug 6966 Comments Help

Updates the help file in the reviews folder.

13 years agoBug 6966 Holds Help
Nicole C. Engard [Fri, 7 Oct 2011 17:31:32 +0000 (13:31 -0400)]
Bug 6966 Holds Help

Update file in the reserve folder.

13 years agoBug 6966 Reports Help
Nicole C. Engard [Fri, 7 Oct 2011 17:13:53 +0000 (13:13 -0400)]
Bug 6966 Reports Help

This patch updates all the help files in the reports
folder and adds links to the manual pages.

13 years agoBug 6966 Patron Card Help Files
Nicole C. Engard [Fri, 7 Oct 2011 15:50:07 +0000 (11:50 -0400)]
Bug 6966 Patron Card Help Files

This patch adds links to the manual to files in the
patroncards folder.

13 years agoBug 6966: Offline Circ Help
Nicole C. Engard [Thu, 6 Oct 2011 19:15:21 +0000 (15:15 -0400)]
Bug 6966: Offline Circ Help

This patch adds the manual link to the offline circ help.

13 years agoBug 6966: Members Help Files
Nicole C. Engard [Thu, 6 Oct 2011 18:43:26 +0000 (14:43 -0400)]
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.

13 years agoBug 6966 update help files for labels
Nicole C. Engard [Thu, 6 Oct 2011 16:03:21 +0000 (12:03 -0400)]
Bug 6966 update help files for labels

This patch adds the manual links to the label maker
help files.

13 years agobug 6966 update help files
Nicole C. Engard [Thu, 6 Oct 2011 15:57:56 +0000 (11:57 -0400)]
bug 6966 update help files

This patch updates help files not in a module specific folder.

13 years agoBug 6966: Export help files
Nicole C. Engard [Thu, 6 Oct 2011 15:53:02 +0000 (11:53 -0400)]
Bug 6966: Export help files

This adds the manual link to the export help file.

13 years agoBug 6966: Circulation Help Files
Nicole C. Engard [Thu, 6 Oct 2011 15:29:17 +0000 (11:29 -0400)]
Bug 6966: Circulation Help Files

This patch updates the help files in the circ folder.
It also adds links to manual pages where needed.

13 years agoBug 6966 Cataloging Help Files
Nicole C. Engard [Mon, 3 Oct 2011 00:02:51 +0000 (20:02 -0400)]
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.

13 years agoBug 6966 Authorities Help Files
Nicole C. Engard [Sun, 2 Oct 2011 23:25:34 +0000 (19:25 -0400)]
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.

13 years agoBug 6966 Catalogue Help Files
Nicole C. Engard [Sun, 2 Oct 2011 23:23:28 +0000 (19:23 -0400)]
Bug 6966 Catalogue Help Files

This patch updates the help files in the catalogue folder
by including the link to the manual.

13 years agoBug 6966 Acquisitions help files
Nicole C. Engard [Sun, 2 Oct 2011 12:24:56 +0000 (08:24 -0400)]
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.

13 years agoBug 6966: Admin Help Files
Nicole C. Engard [Sun, 2 Oct 2011 09:38:12 +0000 (05:38 -0400)]
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.

13 years agoBug 6959: can't import record via Z39.50 from MARC edit page
Ian Walls [Tue, 4 Oct 2011 17:24:05 +0000 (13:24 -0400)]
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>
13 years agoFix for Bug 4223 - Too much serials info - design work needed
Owen Leonard [Wed, 28 Sep 2011 13:58:04 +0000 (09:58 -0400)]
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>
13 years agoBug 6048: printoverdues.sh bash odities
Jonathan Druart [Thu, 7 Apr 2011 15:08:48 +0000 (17:08 +0200)]
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>
13 years ago6786: False detection of index names in Search; make index names case insensitive
Marcel de Rooy [Thu, 25 Aug 2011 11:12:38 +0000 (13:12 +0200)]
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>
13 years ago6769 Getting rid of some RIS errors/warnings
Marcel de Rooy [Wed, 24 Aug 2011 14:12:52 +0000 (16:12 +0200)]
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>
13 years ago6584: Enable searching on Zebra's Bib-level index
Marcel de Rooy [Wed, 13 Jul 2011 13:05:16 +0000 (15:05 +0200)]
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>
13 years agoBug 6953 - Value builder for NORMARC 007 does not show further options
Magnus Enger [Sat, 1 Oct 2011 15:43:55 +0000 (17:43 +0200)]
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>
13 years agoFix for Bug 6600, Library name linking wrong if current location is different
Owen Leonard [Tue, 19 Jul 2011 13:12:30 +0000 (09:12 -0400)]
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>
13 years agoBZ6268 follow-up for the form
Paul Poulain [Wed, 29 Jun 2011 19:10:34 +0000 (21:10 +0200)]
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>
13 years agoBug 6268: (MT #6408) Bad Total in basket.pl
Paul Poulain [Mon, 23 May 2011 09:27:07 +0000 (11:27 +0200)]
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>
13 years agoBug 6076: acqui pdf error when marcxml wrong
Jonathan Druart [Fri, 8 Jul 2011 09:13:41 +0000 (11:13 +0200)]
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>
13 years agoBZ6074: setting import flag when staged file imported in aqbasket
Paul Poulain [Tue, 5 Apr 2011 20:11:15 +0000 (22:11 +0200)]
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>
13 years agobug_6974: bugfix: do not create empty record before building input for new biblio
Srdjan Jankovic [Thu, 6 Oct 2011 00:55:47 +0000 (13:55 +1300)]
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>
13 years agoBug 6958 : Fix for leading spaces being stripped on translation
Chris Cormack [Mon, 3 Oct 2011 21:43:45 +0000 (10:43 +1300)]
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>
13 years agobug_6770: removed doubled override increment when using AllowHoldPolicyOverride
Srdjan Jankovic [Tue, 6 Sep 2011 04:07:49 +0000 (16:07 +1200)]
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>
13 years agoBug 6975: OPACBaseurl instead of OPACBaseURL
Ian Walls [Wed, 5 Oct 2011 18:20:43 +0000 (14:20 -0400)]
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>
13 years agoBug 6867: Date last seen ignored on import
D Ruth Bavousett [Tue, 4 Oct 2011 14:37:33 +0000 (07:37 -0700)]
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>
13 years agoBug 6937 - change "Fines" to "Fees & Charges" on circ page
Robin Sheat [Thu, 29 Sep 2011 03:13:53 +0000 (16:13 +1300)]
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>
13 years agoMerge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster
Chris Cormack [Mon, 3 Oct 2011 19:56:56 +0000 (08:56 +1300)]
Merge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster

13 years agoBug 5236 Followup: items table information being keyed by biblionumber instead!
Ian Walls [Mon, 3 Oct 2011 14:45:59 +0000 (10:45 -0400)]
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>
13 years agoBug 6633: SCO return button doesn't work
Ian Walls [Tue, 27 Sep 2011 18:09:45 +0000 (14:09 -0400)]
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>
13 years agoBug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
Ian Walls [Wed, 21 Sep 2011 15:08:33 +0000 (11:08 -0400)]
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>
13 years agoUpdating history and about file
Chris Cormack [Tue, 27 Sep 2011 20:53:34 +0000 (09:53 +1300)]
Updating history and about file

13 years agoMerge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster
Chris Cormack [Tue, 27 Sep 2011 20:51:05 +0000 (09:51 +1300)]
Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster

13 years agoBug 6871 - Have a link to the schema page on the reports page
Thatcher Rea [Tue, 27 Sep 2011 20:06:33 +0000 (15:06 -0500)]
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>
13 years agoBug 6927-- Typo in C4::Overdues.pm
Liz Rea [Tue, 27 Sep 2011 14:08:33 +0000 (09:08 -0500)]
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>
13 years agoFix for Bug 6872 - Can't set default SMS messaging options for patron category
Owen Leonard [Thu, 15 Sep 2011 13:42:38 +0000 (09:42 -0400)]
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>
13 years agoBug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
Chris Cormack [Mon, 26 Sep 2011 22:14:06 +0000 (11:14 +1300)]
Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited

13 years agoBug 6801: checkoverdues returns unnecessary fields, causing slowness
Ian Walls [Wed, 31 Aug 2011 18:43:09 +0000 (14:43 -0400)]
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>
13 years agoBug 4841: biblio-level itemtypes not searchable in advance search by itype
Larry Baerveldt [Thu, 22 Sep 2011 20:36:05 +0000 (16:36 -0400)]
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>
13 years agoBug 6869 Batch item modification fails whit accented characters
Frédéric Demians [Wed, 14 Sep 2011 19:44:49 +0000 (21:44 +0200)]
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>
13 years agoMerge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Mon, 26 Sep 2011 19:22:32 +0000 (08:22 +1300)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

13 years agoBug 6755 Followup setlanguagecookie used in 2 places
Frédéric Demians [Mon, 26 Sep 2011 18:30:11 +0000 (20:30 +0200)]
Bug 6755 Followup setlanguagecookie used in 2 places

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Mon, 26 Sep 2011 18:05:03 +0000 (07:05 +1300)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

13 years agoBug 6755 : Fixing a bug with guided reports
Chris Cormack [Mon, 26 Sep 2011 18:04:02 +0000 (07:04 +1300)]
Bug 6755 : Fixing a bug with guided reports

13 years agoMerge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Mon, 26 Sep 2011 10:26:45 +0000 (23:26 +1300)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6755 Web browser default lang != syspref selected langs
Frédéric Demians [Fri, 23 Sep 2011 13:06:56 +0000 (15:06 +0200)]
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.

13 years agoMerge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Mon, 26 Sep 2011 10:14:36 +0000 (23:14 +1300)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

13 years agoBug 6755 Follow up, fixing broken call to themelanguage
Chris Cormack [Mon, 26 Sep 2011 10:13:18 +0000 (23:13 +1300)]
Bug 6755 Follow up, fixing broken call to themelanguage

13 years agoAdding new developer to history
Chris Cormack [Mon, 26 Sep 2011 01:40:13 +0000 (14:40 +1300)]
Adding new developer to history

13 years agoBug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T...
Janusz Kaczmarek [Sun, 5 Jun 2011 21:41:03 +0000 (00:41 +0300)]
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>
13 years agoFixing a broken test
Chris Cormack [Sun, 25 Sep 2011 22:55:58 +0000 (11:55 +1300)]
Fixing a broken test

13 years agoBug:6781--Log membership renewal
Meenakshi.R [Mon, 29 Aug 2011 11:06:25 +0000 (16:36 +0530)]
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>
13 years agoBug 6649 Allow help screens editing
Frédéric Demians [Sat, 17 Sep 2011 07:09:23 +0000 (09:09 +0200)]
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>
13 years agoFix for Bug 4298 - Title detail display: improve display of item level hold information
Owen Leonard [Tue, 20 Sep 2011 16:21:34 +0000 (12:21 -0400)]
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>
13 years agoMerge remote-tracking branch 'kc/new/bug_6205' into kcmaster
Chris Cormack [Sun, 25 Sep 2011 08:23:21 +0000 (21:23 +1300)]
Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster

13 years agoBug 6205 - if an include doesn't exist, fall back to en
Robin Sheat [Thu, 22 Sep 2011 03:32:24 +0000 (15:32 +1200)]
Bug 6205 - if an include doesn't exist, fall back to en

If a language that doesn't exist gets accessed, then it will fall back
to en for the templates, but not for the includes, so everything still
dies. This allows the process to work in this case too.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm the bug and the solution. This issue occurs when templates are
partially translated. The main template (.tt) is found for a specific
language, so this language is returned by themetemplate. But in the main
template, some include files (subtemplates) are referenced that can very
well not exist if the translation process had failed to generate them.
This kind of failure is reported by 'translate' script. It's very easy
to miss it, but it's the translator responsability to check it.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6871 - add schema and sql library reports to guided reports sidebar
Liz Rea [Thu, 22 Sep 2011 18:59:11 +0000 (13:59 -0500)]
Bug 6871 - add schema and sql library reports to guided reports sidebar

This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6773: circ/ysearch.pl is unlimited
Joy Nelson [Fri, 23 Sep 2011 02:36:48 +0000 (22:36 -0400)]
Bug 6773: circ/ysearch.pl is unlimited

Added a LIMIT 10 to the SQL statement
Edited the circulation.pref stating that autocomplete returns the first 10 results at a time

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFixing a bug in the templates that will break translation
Chris Cormack [Sat, 24 Sep 2011 08:54:42 +0000 (20:54 +1200)]
Fixing a bug in the templates that will break translation

13 years agoBug 6901: Add classes to XSLT detail view in OPAC
Katrin Fischer [Wed, 21 Sep 2011 20:39:51 +0000 (22:39 +0200)]
Bug 6901: Add classes to XSLT detail view in OPAC

This patch adds css classes to the fields in XSLT OPAC view so
you can use OpacUserCss system preference for formatting
and hiding fields.

The css classes are named like the labels with additional underscores
where necessary.

Example:
.publisher {
display:none;
}

.other_title {
font-weight: bold;
}

Note: Patch also moves some hard-coded CSS from Utils into the CSS file (only
apples for 880 fields)

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6901: Add classes to XSLT detail view in STAFF
Katrin Fischer [Wed, 21 Sep 2011 19:17:16 +0000 (21:17 +0200)]
Bug 6901: Add classes to XSLT detail view in STAFF

This patch adds css classes to the fields in XSLT intranet views.
Use OpacUserCss and IntranetUserCss system preferences for altering the styling of
and hiding fields.

The css classes are named like the labels with additional underscores
where necessary.

Example:
.publisher {
display:none;
}

.other_title {
font-weight: bold;
}

Note: This patch also fixes the display of additional authors in field 880 (original
scripts like Hebrew). This small additional problem was found as a side effect of testing, where the
existence of an author in 880 would break the XSLT.

Also moves some CSS from a style attribute into the CSS file for 880 fields.

Signed-off-by: Liz Rea <lrea@nekls.org>
-- minor commit message edits (requested by KF)

13 years agoFix for Bug 6884, Improve TinyMCE configuration on Koha News page
Owen Leonard [Fri, 16 Sep 2011 14:27:24 +0000 (10:27 -0400)]
Fix for Bug 6884, Improve TinyMCE configuration on Koha News page

- Increases the width of the editor to fill the space provided
- Adjusts the layout of the toolbars to better fit the space
- Adds a custom editor stylesheet to make the contents of the
  editor better match the expected output

In changing the toolbar configuration I chose to make the display
of each button explicit rather than assuming a default set of
buttons and adding or subtracting from that. I think this is
clearer for someone approaching the configuration trying to under-
stand how buttons are displayed. I also chose to use the
shorthand "|" instead of "separator" for brevity. This last change
is the only one made to the edithelp configuration.

[2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
fixing help pages editing, and so could be applied before or after it.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address
Liz Rea [Wed, 14 Sep 2011 19:56:03 +0000 (14:56 -0500)]
Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address

Patch makes it so that Koha sends patron update emails from the first valid patron email address, instead of from the KohaAdmin or branch email address.

This patch should make it so that libraries can directly reply to patrons regarding patron updates.

To test:

Create a patron with no email address, do a patron update and observe the to: and from: - they should both be the KohaAdminEmail address.

Add an email address to that same patron, and send a patron update. Observe the to: and from: - the from: should be the first valid email address of the patron, to should be the KohaAdminEmail address.

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>
13 years agoMerge remote-tracking branch 'kc/new/bug_6460' into kcmaster
Chris Cormack [Fri, 23 Sep 2011 22:03:08 +0000 (10:03 +1200)]
Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster

13 years agoBug 6460: alternative fix, updating template and script instead of C4::Log
MJ Ray [Thu, 22 Sep 2011 18:27:43 +0000 (19:27 +0100)]
Bug 6460: alternative fix, updating template and script instead of C4::Log

Add some test cases and fix a bug in C4::Log found by in review.
Thanks-to: Katrin Fischer.
Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoFix for Bug 5436 - Extended patron attributes display improvements
Henri-Damien LAURENT [Fri, 5 Aug 2011 18:33:11 +0000 (14:33 -0400)]
Fix for Bug 5436 - Extended patron attributes display improvements

Show patron attributes in the sidebar on circ and patron pages

[Edit from Owen Leonard: This patch takes changes originally in
Bug 5436 and isolates just the parts relating to display of
patron attributes. Because function for pulling patron attributes
was merged with the function for displaying address information
in SetMemberInfosInTemplate() (also found in Bug 5749), I moved
the call to GetBorrowerAttributes into the individual scripts.
That keeps the functionality relating specifically to patron
attributes separate from the proposed changes to displaying
addresses.

Because I think it's important to keep the display consistent,
I added display of patron attributes to all pages which include
the patron information sidebar.]

Rebased for compatability with bug 3489 and database documentation by
Ian Walls, 9-21-11

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
Chris Cormack [Fri, 23 Sep 2011 03:01:21 +0000 (15:01 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster

13 years agoBug 4877 - note that the create-db (or related) options are required
Robin Sheat [Thu, 22 Sep 2011 02:36:42 +0000 (14:36 +1200)]
Bug 4877 - note that the create-db (or related) options are required

Also fix the example so that it is there.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote-tracking branch 'kc/new/bug_6679' into kcmaster
Chris Cormack [Fri, 23 Sep 2011 02:19:11 +0000 (14:19 +1200)]
Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster

13 years agoBug 6679 : Enable Critic tests for authorities and fixed resulting warnings
Chris Cormack [Wed, 21 Sep 2011 03:52:23 +0000 (15:52 +1200)]
Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings

Signed-off-by: Ian <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6824 - correctly check basket viewing permissions
Robin Sheat [Wed, 31 Aug 2011 03:22:38 +0000 (15:22 +1200)]
Bug 6824 - correctly check basket viewing permissions

Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.

Applies to both 3.04.04 and master.

Signed-off-by: Brendan <info@bywatersolutions.com>
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoMerge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

13 years agoBug 6755 follow up, fixing broken POD
Chris Cormack [Thu, 22 Sep 2011 23:33:00 +0000 (11:33 +1200)]
Bug 6755 follow up, fixing broken POD

13 years agoBug 3941: Follow up
Katrin Fischer [Thu, 22 Sep 2011 21:35:08 +0000 (23:35 +0200)]
Bug 3941: Follow up

Improving the notices field to make it possible
- to expand more than one field at a time
- hide the notice content with another click

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 3941 - Combine Notices & Messaging Tabs
Katrin Fischer [Thu, 22 Sep 2011 19:32:42 +0000 (21:32 +0200)]
Bug 3941 - Combine Notices & Messaging Tabs

Changes to notices tab to make it a full replacement for messages tab.
Removes messages tab from patron account.

- repairs view of patron address in left column (category description, branch)
- shows some explanation, when there are no messages for a borrower
- makes the notice an expandable field, a click on the subject will
  expand the field to show the message content
- makes message status and message transport type translatable,
  by moving the possible values into the template
- removes the messaging tab from various menus
- removes the files that were associated with the messaging tab
- preserves the line breaks in message content to improve readability

Also fixes Bug 6593 - Some information missing from the "Notices" tab.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6755 follow up
Alex Arnaud [Thu, 22 Sep 2011 09:05:13 +0000 (11:05 +0200)]
Bug 6755 follow up

Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
in preferences.pl

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6755 Problems with switching languages
Frédéric Demians [Thu, 25 Aug 2011 13:01:19 +0000 (15:01 +0200)]
Bug 6755 Problems with switching languages

This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.

It fixes also a bug related to language preselection based on web
browser prefered language.

September 9: Adjusted with input of Frederic Demians.

Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6881 - Not able to accept a suggestion (typo in template)
Chris Cormack [Wed, 21 Sep 2011 22:33:34 +0000 (10:33 +1200)]
Bug 6881 - Not able to accept a suggestion (typo in template)

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy fix, works great.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoAlternate fix for Bug 2534 - Viewing items table on item edit screen requires horizon...
Owen Leonard [Mon, 22 Aug 2011 15:33:59 +0000 (11:33 -0400)]
Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling

This patch doesn't eliminate horizontal scrolling, but simplifies
the situation:

- The left-hand sidebar has been moved below the table of items.
- The "overflow:scroll" style has been removed from the table of items.
  Having overflow set meant that it was often necessary to scroll twice
  to reach data in the table: once using the scrollbars on the table
  and again using the page's scrollbars.

The NEKLS catalogers also extend their thanks for this fix.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 3704: SIP Checkin of not checked out item returns error without reason
Katrin Fischer [Fri, 2 Sep 2011 14:21:23 +0000 (16:21 +0200)]
Bug 3704: SIP Checkin of not checked out item returns error without reason

Checking in an available item returns an error (which is correct) without
giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).

Based on code suggested by Patrick Langer <patrick.langer@easycheck.org>

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agobug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available...
Srdjan Jankovic [Wed, 7 Sep 2011 04:02:21 +0000 (16:02 +1200)]
bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- add new fund for an active budget
- order item, price 8.00
- check funds page and acq home: committed amount should be 8.00
- receive item, enter actual price 10.00
- check funds page and acq home: spent amount should be 10.00

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6900 - line break between available and reference items
D Ruth Bavousett [Wed, 21 Sep 2011 15:50:19 +0000 (08:50 -0700)]
Bug 6900 - line break between available and reference items

This patch adds a conditional line-break in the availability section of XSLT results.

Signed off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6360 - add some more sounds to some happenings on returns
Robin Sheat [Tue, 13 Sep 2011 03:50:26 +0000 (15:50 +1200)]
Bug 6360 - add some more sounds to some happenings on returns

This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.

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>
13 years agobug_6576: Submit when changing framework rather then reloading
Srdjan Jankovic [Mon, 12 Sep 2011 09:09:49 +0000 (21:09 +1200)]
bug_6576: Submit when changing framework rather then reloading

TransformHtmlToMarc(): changed interface - no point passing params when
they can be accessed from $cgi

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6679 : fix 3 perl::critic warnings
Maxime Pelletier [Tue, 20 Sep 2011 21:40:36 +0000 (17:40 -0400)]
Bug 6679 : fix 3 perl::critic warnings

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6679 Followup for acqui/histsearch.pl
Frédéric Demians [Sat, 17 Sep 2011 06:02:54 +0000 (08:02 +0200)]
Bug 6679 Followup for acqui/histsearch.pl

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
13 years agoBug 6679 Fix scripts in admin & acqui to pass Perl::Critic
Chris Cormack [Mon, 8 Aug 2011 08:29:05 +0000 (20:29 +1200)]
Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic

Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.

- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp

Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.

Defining a named sub within another sub, does not prevent that
subroutine being global

Signed-off-by: Frédéric Demians <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>