Owen Leonard [Fri, 26 Aug 2011 20:07:46 +0000 (16:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / branches
Correction for branch admin template stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 19:56:00 +0000 (15:56 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
Fixing improperly nested template logic inside HTML tags in
clone circulation rules form.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.
This patch removes the "selected" variable from the template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 11 Aug 2010 00:27:39 +0000 (02:27 +0200)]
Fix for Bug 6458 Follow-up for memberentrygen.tt
The registration date field would show up twice after applying the first
patch for memberentrygen.tt.
This patch fixes the problem.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
member entry form.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:53:24 +0000 (10:53 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in the
system preferences editor.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:36:50 +0000 (10:36 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in spine
label print template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:26:19 +0000 (10:26 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in member
details template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:06:03 +0000 (10:06 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
aqplan template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 13:40:08 +0000 (09:40 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside markup in header.inc
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 20:15:34 +0000 (16:15 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
branch transfer limits template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 22:40:56 +0000 (00:40 +0200)]
Bug 6458: Incorrect translation processing / results
Removed template toolkit directives from within HTML tags.
Advanced Search > Scan Index > Search results
Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
index as 'Series'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 22:09:11 +0000 (00:09 +0200)]
Bug 6458: Incorrect translation processing / suggestion
Removes template toolkit directives from within HTML tags.
Acquisitions > Suggestions
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sat, 20 Aug 2011 17:02:01 +0000 (19:02 +0200)]
Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt
Problems were related to buttons for renewing items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
After, no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 18:49:23 +0000 (20:49 +0200)]
Bug 6458: Incorrect translation processing / serials/...
Fixes problems with template toolkit directives within HTML tags
for the serials module.
Serials > add/modify subsciption
serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 17:43:58 +0000 (19:43 +0200)]
Bug 6458: Incorrect translation processing - rotating_collections/...
Patch removes templates directives from HTML tags in the
rotating collections module.
The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 25 Aug 2011 16:48:55 +0000 (12:48 -0400)]
Bug 6458: Incorrect translation processing / opac-detail.tt
Patch removes template directives from within HTML tags from OPAC detail view.
Problems were related to the items tabs for holdings, subscriptions, and serial collection.
Fixed the problem spotted by Frère Sébastien Marie - thx!
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 22:06:00 +0000 (00:06 +0200)]
Bug 6458: Incorrect translation processing / cataloguing/...
Patch removes template directives from within HTML tags from
- cataloging > new record
- cataloging
- UNIMARC plugin for 4XX
There is one problem remaining in addbiblio:
<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
[% frameworkcodeloo.frameworktext %]
</option>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:47:02 +0000 (23:47 +0200)]
Bug 6458: Incorrect translation processing / acqui/...
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sat, 20 Aug 2011 17:38:30 +0000 (19:38 +0200)]
Bug 6458: Incorrect translation processing - masthead.inc
Patch removes templates directives from HTML tags in masthead.inc
Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83
After no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:25:37 +0000 (23:25 +0200)]
Bug 6458: Incorrect translation processing / 3x reports/...
Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:16:12 +0000 (23:16 +0200)]
Bug 6458: Incorrect translation processing / authorities.tt
Patch removes template directives from within HTML tags from
authorities > modify authority.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:00:18 +0000 (23:00 +0200)]
Bug 6458: Incorrect translation processing / review.tt
Patch removes template directives from within HTML tags from
Tools > Tags.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 20:46:28 +0000 (22:46 +0200)]
Bug 6458: Incorrect translation processing / overdue.tt
Patch removes template directives from within HTML tags from
circulation > overdues.
Problems were related to patron flags pull down and sort by loop for patron attributes.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 21 Aug 2011 17:58:48 +0000 (19:58 +0200)]
Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Tue, 2 Aug 2011 12:59:28 +0000 (13:59 +0100)]
Bug 3498 [ENH] Allow Partial Payment of Fines
Allow partial payment of outstanding fines
against either individual fine entries or as a lump payment
Sponsered by East Brunswick Public Library, East Brunswick, NJ, USA
NB: Adds a version of the include circ-menu.inc as circ-menu.tt
this has the same functionality as the old include but does not
require all the borrowers attributes to be passed as global
scoped variables
Signed-off-by: Liz Rea <lrea@nekls.org>
Bug 3498 - Documentation update to explain what every button does.
Help file updated to the following:
Pay and Writeoff Fines
Each line item can be paid in full, partially paid, or written off.
Pay a fine in full
Click "Pay" next to the fine you want to pay in full
The full amount of the fine will be populated for you in the "Collect From Patron" box
Click "Confirm"
The fine will be removed from outstanding fines, and displayed as fully paid.
Pay a partial fine
Click "Pay" next to the fine you want to partially pay
Enter the amount you are collecting from the patron in the "Collect From Patron" box
Click "Confirm"
The fine will be updated to show the original Amount, and the current Amount Outstanding
Writeoff a single fine
Click "Writeoff" next to the fine you wish to writeoff.
The fine will be removed from outstanding fines, and displayed as fully paid.
Pay an amount towards all fines
Click the "Pay Amount" button
Enter the amount you are collecting from the patron in "Collect from Patron." The sum of all fines is shown in "Total Amount Outstanding"
Click "Confirm"
The fine totals will be updated with the payment applied to oldest fines first.
Writeoff All fines
Click the "Writeoff All" button
All fines will be removed from outstanding fines, and displayed as written off.
Pay Selected fines
Check the selection boxes next to the fines you wish to pay, click "Pay Selected"
Enter an amount to pay towards the fines.
Click "Confirm"
The fine totals will be updated with the payment applied to the oldest selected fines first.
Bug 3498 - adding parens to TT IF Statements for style
pay.tt
Bug 3498 - Add parens to TT IF statements for style
paycollect.tt
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 12 Sep 2011 02:53:21 +0000 (14:53 +1200)]
Adding the 155th developer to the history
Chris Cormack [Mon, 12 Sep 2011 01:57:19 +0000 (13:57 +1200)]
While testing the commits for 6716 I discovered a couple of missing
drop tables, fixed now
Magnus Enger [Thu, 30 Jun 2011 06:47:35 +0000 (08:47 +0200)]
Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.
This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.
To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Meenakshi.R [Tue, 6 Sep 2011 07:29:56 +0000 (12:59 +0530)]
Bug id:6783 - Circulation restrictions dont work when other withdrawn reasons are used
Circulation restrictions work only when withdrawn reason (value 1) is selected.
If ones sets up other withdrawn reasons using authorized values, and selects
one of them (e.g. value 2), circulation restrictions don't work. This changes
fixes this problem.
Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Thu, 8 Sep 2011 18:30:32 +0000 (14:30 -0400)]
Follow up to Bug 6857: Change language from 'reserve' to 'hold'
Reserves are called holds all throughout the OPAC so this follow up
updates the language in this patch to match the standard.
Also adds an id tag to the message for altering with JQuery.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Thu, 8 Sep 2011 06:29:24 +0000 (18:29 +1200)]
Bug 6857: display a charge warning alert for reserves
If a user is placing a reserve on the OPAC, this'll let them know that
it's going to cost them.
Author: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 9 Sep 2011 10:55:59 +0000 (06:55 -0400)]
Bug 6861: Fast Add returns to circ/circulation.pl in all cases
If Fast Add is accessed from either the circulation homepage or cataloguing,
it should stay on the additem.pl page after saving the first item. Only when
a Fast Add is done in the middle of a circulation transaction should it redirect
back to circ/circulation.pl to complete that transaction.
This patch adds a conditional check for a borrowernumber input param; the presense
of such implies we're in the middle of a checkout. It's absense implies we should
remain on additem.pl
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sat, 10 Sep 2011 09:40:09 +0000 (21:40 +1200)]
Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster
Ian Walls [Fri, 9 Sep 2011 18:37:22 +0000 (14:37 -0400)]
Bug 6863: Shelf Browser images not showing up
Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Fri, 9 Sep 2011 10:34:56 +0000 (06:34 -0400)]
Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.
This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sat, 10 Sep 2011 09:35:49 +0000 (21:35 +1200)]
Bumpding database version
Ian Walls [Thu, 8 Sep 2011 21:15:39 +0000 (17:15 -0400)]
Enh 6165: Add OPACResultsSidebar system preference
Adds a system preference for displaying content under the "Refine your Search" menu
on OPAC search results. Arbitrary HTML can be added, like OpacNav, opacheader, opaccredits
and other such system preferences
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 7 Sep 2011 01:45:58 +0000 (13:45 +1200)]
Bug 6687 - allow people to be moved in the holds queue
This fixes a regression introduced by Bug 6526 that told you someone
already had a reserve if you attempted to move their ordering in the
hold queue.
(note: it also cleans a host of trailing whitespace errors that were in
that file)
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>
Chris Cormack [Thu, 8 Sep 2011 01:36:51 +0000 (13:36 +1200)]
Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster
Marcel de Rooy [Wed, 7 Sep 2011 12:28:45 +0000 (14:28 +0200)]
6256 Follow up fixing typo
Fixing typo for 1062
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Thu, 1 Sep 2011 08:09:48 +0000 (10:09 +0200)]
Bug 6750 Guarantor search broken on translated templates
Fix the JavaScript to avoid implementing complex string substitution into JS
function call. This patch solves the bug and keep the ability to copy
borrower's address, name, etc., containing new line, simple quote, etc.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ian Walls [Sun, 28 Aug 2011 01:19:55 +0000 (21:19 -0400)]
Bug 6256: Many bib1 attributes missing
This patch adds all the bib1 attributes listed in the bug report, in numerical order. Names of attributes are
normalized; spaces are replaced by '-', '--' is reduced to '-' and parentheticals are dropped
In the particular case of att 1062, it is renamed from 'stocknumber' to 'Number-local-acquisition',
as per the bib1 definition. The mapping in ccl.properties is retained as 'stocknumber', so all search
functions should continue to behave normally
Signed-off-by: <dev_patches@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Tue, 9 Aug 2011 11:51:57 +0000 (13:51 +0200)]
Bug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc
There were some lines in the specific french sysprefs that were not french/unimarc specific at all
I've removed them, the file now only contains french & unimarc specific things
I also have removed NoZebra as it's deprecated, so should not be here anymore
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Wed, 15 Jun 2011 06:38:40 +0000 (08:38 +0200)]
Bug 6537 - squashed version of the previous 5 commits, signed-off
Bug 6537 - Move installer/data/mysql/en/mandatory/sysprefs.sql to installer/data/mysql/sysprefs.sql
Bug 6537 - Make the web installer use installer/data/mysql/sysprefs.sql
Bug 6537 - New syspref files with only the prefs that differ from the default
I have mostly deleted old syspref files and created new ones, with a new name,
mainly in order to reduce the risk of merge conflicts if the old syspref files
are changed before this patch is pushed, if it is pushed.
See http://wiki.koha-community.org/wiki/Simplified_syspref_handling_RFC for
a description of how the new files were created to reflect sysprefs that
differ from the global default.
.txt files have been moved to reflect the new names of the SQL files they are
associated with.
Bug 6537 - Remove syspref-related tests in xt/
As far as I can see, the previous patches for this bug makes the syspref tests
obsolete, and this patch removes them:
xt/syspref.t
xt/check_sysprefs.t
Bug 6537 - Fix a problem in French syspref file
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 5 Sep 2011 02:50:29 +0000 (14:50 +1200)]
Follow up for 6665 : Fixing the hide_marc pref also
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>
Chris Cormack [Mon, 5 Sep 2011 02:42:55 +0000 (14:42 +1200)]
Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
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>
Chris Cormack [Sun, 4 Sep 2011 23:27:40 +0000 (11:27 +1200)]
Bug 6555 : only 10 lists show in the staff client
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>
Colin Campbell [Sun, 9 Jan 2011 23:53:05 +0000 (23:53 +0000)]
Bug 5605 [ENH] SIP: Add Support for the Fee Paid Message
Allow fee paid to be supported for those machines which handle it
Development Sponsered by Halton Borough Council
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 5 Sep 2011 02:04:26 +0000 (14:04 +1200)]
Bug 6732 : Showing the bibliographic title on the manual invoices line
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Chris Cormack [Tue, 6 Sep 2011 20:49:31 +0000 (08:49 +1200)]
Updating about file and history doc
Brett Wilkins [Mon, 29 Aug 2011 04:47:48 +0000 (16:47 +1200)]
bug 6724: enable decimals on values greater than 1
Separating perl standard uses from koha uses
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>
Chris Cormack [Sun, 4 Sep 2011 08:49:09 +0000 (20:49 +1200)]
Updating history and about file
Robin Sheat [Mon, 29 Aug 2011 00:24:45 +0000 (12:24 +1200)]
Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Sun, 28 Aug 2011 13:02:09 +0000 (15:02 +0200)]
Bug 4877 [ENH] - Update man page for koha-create
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
(to be followed by another patch that I think helps too)
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Tue, 9 Aug 2011 08:22:20 +0000 (10:22 +0200)]
Bug 6516 - Make borrowernumber of staff user configurable in koha-create
Sets the default borrowernumber of staff user to 1 and makes it possible
to override this with ADMINUSER in /etc/koha/koha-sites.conf or with the
--adminuser and -a command line options.
Remember to update the wiki if this gets pushed!
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Wed, 22 Jun 2011 06:00:24 +0000 (18:00 +1200)]
Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen
This allows the build information to not be suppressed when using
build-git-snapshot. This makes seeing where problems are substantially
easier.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Wed, 10 Aug 2011 11:46:18 +0000 (13:46 +0200)]
Bug 6121: follow-up = using overloo instead of reserveloo
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Christophe Croullebois [Tue, 8 Feb 2011 16:58:54 +0000 (17:58 +0100)]
Bug 6121: Holds awaiting pickup
On holds over, when cancelling hold and returning to his branch a bug fill the branchtransfers.tobranch field with the branchname instead of the branch code.
BibLibre MT5647
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 23 Aug 2011 18:57:02 +0000 (14:57 -0400)]
Fix for Bug 5028 - Remove references to catmaintain.pl
catmaintain.pl doesn't exist anymore. References to it in the
templates should be removed.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 23 Aug 2011 18:52:37 +0000 (14:52 -0400)]
Fix for Bug 6768, Two unused include files can be removed
Removing error-top.inc and error-bottom.inc
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Fri, 2 Sep 2011 12:36:21 +0000 (14:36 +0200)]
Bug 4966 - follow up - add xhtml closure for input tags
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Fri, 5 Aug 2011 14:09:21 +0000 (10:09 -0400)]
bug4966 - follow up to 4966 changes language from 'end' to 'finish'
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Fri, 5 Aug 2011 13:47:16 +0000 (15:47 +0200)]
bug 4966: Add a button in parcel.pl for confirm end receiving
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 17 Jul 2011 15:18:47 +0000 (17:18 +0200)]
Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
Patch fixes some translation issues and address formatting for printed
hold notices.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 17 Jul 2011 14:20:00 +0000 (16:20 +0200)]
Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
Translates the purchase suggestion mails in sample_notices.sql from English to German.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Henri-Damien LAURENT [Fri, 2 Sep 2011 08:36:29 +0000 (10:36 +0200)]
bug 6834 followup removing param_map
param_map was still to be found in two files.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 2 Sep 2011 03:31:28 +0000 (15:31 +1200)]
Bug 6834 : Removing last of the $template->{param_map}
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 2 Sep 2011 18:35:17 +0000 (06:35 +1200)]
Merge branch 'new/bug_6479' into kcmaster
Frédérick Capovilla [Tue, 7 Jun 2011 18:03:08 +0000 (14:03 -0400)]
Bug 6479 Converts all the serialseq variables to UTF-8.
Corrects a problem when an UTF-8 character is used in the serial
numbering formula. The encoding became incorrect when concatenating the
number in the subscriptionhistory table.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To reproduce:
- Create subscription with numbering pattern N° {X}
- Receive 2 or more issues
- Check subscription summary page and manual history fields on the edit screen
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 22 Aug 2011 20:09:05 +0000 (16:09 -0400)]
Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
Removing unused script.
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 2 Sep 2011 01:22:20 +0000 (13:22 +1200)]
Revert "Bug 5630 CAS improvements"
This reverts commit
9a3950f673c28688a2ead6514c3320e34ec0cc4c.
Steven Callender [Tue, 30 Aug 2011 19:19:23 +0000 (15:19 -0400)]
Bug 6822: fix RIS export from OPAC
Prior to this patch, RIS export was producing
effectively empty output.
Signed-off-by: Steven Callender <stevecallender@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Thu, 1 Sep 2011 09:28:41 +0000 (21:28 +1200)]
Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster
Ian Walls [Tue, 30 Aug 2011 17:49:51 +0000 (13:49 -0400)]
Bug 6351: Cannot delete library-specific holds polices and checkout limits
Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.
Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 29 Aug 2011 04:46:11 +0000 (16:46 +1200)]
Bug 6704 : Escaping html in the merging records, so " don't break the merge
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
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>
Chris Cormack [Mon, 29 Aug 2011 03:35:45 +0000 (15:35 +1200)]
Bug 6656 : Fix for advanced search not respecting default sort order
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>
Maxime Pelletier [Fri, 26 Aug 2011 21:09:46 +0000 (09:09 +1200)]
Bug 6794 : Fixing a bug with member flags in IE
Rebased for template toolkit
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Chris Cormack [Fri, 26 Aug 2011 01:42:44 +0000 (13:42 +1200)]
Bug 5524 : Cant delete list from the second page of lists
Includes follow up fixing deleting lists in OPAC
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>
Chris Cormack [Mon, 29 Aug 2011 02:14:58 +0000 (14:14 +1200)]
Bug 6528 : Cataloguing search not showing location for available items
Cataloging search now shows holdings information.
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>
preprod34 [Fri, 12 Aug 2011 15:44:33 +0000 (11:44 -0400)]
Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.
xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.
http://bugs.koha-community.org/show_bug.cgi?id=6715
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 28 Aug 2011 07:47:22 +0000 (19:47 +1200)]
Updating about page and history
Chris Cormack [Sun, 28 Aug 2011 07:34:25 +0000 (19:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster
Chris Cormack [Sun, 28 Aug 2011 07:34:18 +0000 (19:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster
Owen Leonard [Thu, 11 Aug 2011 19:21:35 +0000 (15:21 -0400)]
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Wed, 10 Aug 2011 15:44:37 +0000 (11:44 -0400)]
Fix for Bug 6696, New category button broken when no categories defined
The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.
This patch hides the table in cases where there are no
categories and displays an error message instead.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 1 Aug 2011 11:51:18 +0000 (07:51 -0400)]
Fix for Bug 6652, Zip showing in funny place on libraries admin
This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.
It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:
[name]
[street address]
[postal code + city]
...or any other variation of course.
While I'm in there, also making branch URLs and emails clickable.
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>
Owen Leonard [Fri, 26 Aug 2011 19:14:48 +0000 (15:14 -0400)]
Fix for Bug 6791 - editing list with apostrophe loses text
Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Fri, 26 Aug 2011 16:14:25 +0000 (17:14 +0100)]
Bug 6733 - Change return page after printing routing slip
Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Ulrich Kleiber [Fri, 29 Jul 2011 14:35:40 +0000 (16:35 +0200)]
Bug 6765: sip2 unicode checksum
Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=
2925760&group_id=161781&atid=821216
http://bugs.koha-community.org/show_bug.cgi?id=6765
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 22 Aug 2011 15:08:59 +0000 (11:08 -0400)]
Fix for Bug 4419 - cannot change module for notice templates
Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.
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>
Chris Cormack [Sat, 27 Aug 2011 07:34:36 +0000 (19:34 +1200)]
Merge branch 'new/bug_4330' into kcmaster
Nicole C. Engard [Sat, 20 Aug 2011 23:33:18 +0000 (19:33 -0400)]
Bug 6662: Remove Dewey Specific References in Sort
The sort option used to include tooltips for call number
that were Dewey specific. This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.
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>
Marcel de Rooy [Mon, 22 Aug 2011 12:02:03 +0000 (14:02 +0200)]
6747 Checks in opac-export
Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.
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>
Chris Cormack [Fri, 26 Aug 2011 03:32:55 +0000 (15:32 +1200)]
Bumping database version
Chris Cormack [Thu, 25 Aug 2011 03:21:01 +0000 (15:21 +1200)]
Bug 5866 : Updated patch to speed up holds awaiting pickup
This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Owen Leonard [Mon, 8 Aug 2011 16:36:07 +0000 (12:36 -0400)]
Fix for Bug 4893, Add an input field for Check In on main Staff Client page
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 26 Aug 2011 03:12:32 +0000 (15:12 +1200)]
Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster