wip/koha-chris_n.git
8 years agoFix for Bug 6842 - Branch transfer limits broken
Owen Leonard [Thu, 15 Sep 2011 14:12:27 +0000 (10:12 -0400)]
Fix for Bug 6842 - Branch transfer limits broken

- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
  conflict. It was the addition of the javascript table pager
  which broke the functionality on this page.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6766 - Template variable scope errors in holds template
Owen Leonard [Tue, 23 Aug 2011 16:18:44 +0000 (12:18 -0400)]
Fix for Bug 6766 - Template variable scope errors in holds template

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 5675 : CheckReserves not honouring item level itemtypes preferences
Chris Cormack [Sun, 28 Aug 2011 23:21:24 +0000 (11:21 +1200)]
Bug 5675 : CheckReserves not honouring item level itemtypes preferences

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
With item level itypes activated only the item for which holds were
allowed in circulation rules triggered the hold notice on checkin.

Also checked that biblio level itype still trigered correctly.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
Chris Cormack [Fri, 16 Sep 2011 01:53:40 +0000 (13:53 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster

8 years agoBug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
Robin Sheat [Wed, 14 Sep 2011 07:03:58 +0000 (19:03 +1200)]
Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process

This uses the docbook source files to generate the man pages, and
installs them to their correct location when the packages are being
built.

This will make it easier for people to write man pages, thereby ensuring
that people join in keeping documentation up to date.

Note: adds docbook-xsl and xsltproc to the dependencies.
Note2: applies on top of Magnus' other patch on this ticket.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 4877 [ENH] Use DocBook for koha-common manual pages
Magnus Enger [Tue, 13 Sep 2011 06:25:36 +0000 (08:25 +0200)]
Bug 4877 [ENH] Use DocBook for koha-common manual pages

This patch
- deletes debian/scripts/koha-create.8
- adds debian/docs/koha-create.xml and koha-remove.xml

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug_6318: Always give predefined fields drop downs on label layout edit
Srdjan Jankovic [Mon, 5 Sep 2011 08:44:14 +0000 (20:44 +1200)]
bug_6318: Always give predefined fields drop downs on label layout edit

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>
8 years agoMerge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Chris Cormack [Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:51:01 +0000 (09:51 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
messaging preferences include.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 1 Sep 2011 15:14:50 +0000 (11:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 12:57:25 +0000 (08:57 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correcting doc-head-open.inc (again?).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Thu, 25 Aug 2011 19:11:09 +0000 (15:11 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Correction for opac-messaging.tt tops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years ago6829: Remove two warnings for opac-MARCdetail
Marcel de Rooy [Thu, 1 Sep 2011 12:07:40 +0000 (14:07 +0200)]
6829: Remove two warnings for opac-MARCdetail

Remove two warnings from logfile by adding simple checks.

Sept 1, revision: Clearing another warning (thx Owen) too.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
Owen Leonard [Mon, 22 Aug 2011 16:23:05 +0000 (12:23 -0400)]
Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl

Removed unnecessary readonly attribute from date fields

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agobug 6677 - remove reference to 'debarred'
Nicole C. Engard [Sat, 6 Aug 2011 11:15:11 +0000 (07:15 -0400)]
bug 6677 - remove reference to 'debarred'

The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6841 - A member with cataloging permissions cannot change branches (when independ...
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)

This patch does a couple of things.

1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).

To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.

With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.

I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6620 Ensure autoflush is set on output filehandles
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles

stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on  so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
Janusz Kaczmarek [Wed, 18 May 2011 20:35:57 +0000 (22:35 +0200)]
Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected

[2011.05.19] I confirm the bug and the solution

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Chris Cormack [Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

8 years agoFollow-up fix for Bug 6458, incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing

Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:33:05 +0000 (09:33 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
CSV profiles template

Also fixing improperly scoped template variable which prevented
the current profile from being preselected under the edit tab.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
Owen Leonard [Tue, 13 Sep 2011 13:01:54 +0000 (09:01 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing

Fixing improperly nested template logic inside HTML tags in
budgets admin search form.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing / branches
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing / patron-attr...
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>
8 years agoFix for Bug 6458 Follow-up for memberentrygen.tt
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoFix for Bug 6458 - incorrect parsing result in translation processing
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>
8 years agoMerge remote-tracking branch 'kc/new/bug_5234' into kcmaster
Chris Cormack [Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)]
Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster

8 years agoFix for Bug 5234 - Remove unused CSS files
Owen Leonard [Tue, 21 Sep 2010 12:35:38 +0000 (08:35 -0400)]
Fix for Bug 5234 - Remove unused CSS files

8 years agoMerge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
Chris Cormack [Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster

8 years agoBug 6716 couple of little typos
Chris Cormack [Tue, 13 Sep 2011 02:33:15 +0000 (14:33 +1200)]
Bug 6716 couple of little typos

8 years agoBug 6651 - fix splitting of names when updating to 3.4
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4

This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoFix for Bug 6609, Clean up guided reports dictionary entry process
Owen Leonard [Mon, 18 Jul 2011 18:36:05 +0000 (14:36 -0400)]
Fix for Bug 6609, Clean up guided reports dictionary entry process

Some general interface cleanup tasks with the guided reports dictionary entry
process:

- Improving the breadcrumb links
- Eliminating the tabs in favor of more descriptive <legend> labels
- Clarifying some labels
- Correcting form markup according to established patterns

(Undertaken primarily because the tabs translated poorly when trying to
re-implement them for Bug 5481, Replace YUI JS libraries with Jquery UI)

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Chris Cormack [Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster

8 years agoBug 6458: Incorrect translation processing / results
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>
8 years agoBug 6458: Incorrect translation processing / suggestion
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>
8 years agoBug 6458: Incorrect translation processing / sco-main.tt
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>
8 years agoBug 6458: Incorrect translation processing / serials/...
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>
8 years agoBug 6458: Incorrect translation processing - rotating_collections/...
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>
8 years agoBug 6458: Incorrect translation processing / opac-detail.tt
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>
8 years agoBug 6458: Incorrect translation processing / cataloguing/...
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>
8 years agoBug 6458: Incorrect translation processing / acqui/...
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>
8 years agoBug 6458: Incorrect translation processing - masthead.inc
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>
8 years agoBug 6458: Incorrect translation processing / 3x reports/...
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>
8 years agoBug 6458: Incorrect translation processing / authorities.tt
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>
8 years agoBug 6458: Incorrect translation processing / review.tt
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>
8 years agoBug 6458: Incorrect translation processing / overdue.tt
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>
8 years agoBug 6458: Incorrect translation processing - doc-head-close/open.inc
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>
8 years agoMerge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
Chris Cormack [Mon, 12 Sep 2011 21:08:50 +0000 (09:08 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster

8 years agoBug 6716: Document suggestions DB table
Nicole C. Engard [Thu, 8 Sep 2011 01:47:48 +0000 (21:47 -0400)]
Bug 6716: Document suggestions DB table

This patch documents the suggestions database table.  Several fields
appear to be unused:

* volumedesc
* publicationyear
* mailoverseeing

They are left undocumented by this patch.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Define reports_dictionary table
Nicole C. Engard [Sat, 27 Aug 2011 05:43:10 +0000 (01:43 -0400)]
Bug 6716 - Define reports_dictionary table

This patch documents the reports_dictionary table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document holiday tables
Nicole C. Engard [Sat, 27 Aug 2011 05:08:25 +0000 (01:08 -0400)]
Bug 6716 - Document holiday tables

This patch documents the special_holidays and repeatable_holidays
tables.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document subscriptionroutinglist table
Nicole C. Engard [Sat, 27 Aug 2011 04:30:15 +0000 (00:30 -0400)]
Bug 6716 - Document subscriptionroutinglist table

This table holds information related to serials routing lists.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Documents the virtual shelves tables
Nicole C. Engard [Sat, 27 Aug 2011 04:14:49 +0000 (00:14 -0400)]
Bug 6716 - Documents the virtual shelves tables

This patch documents the virtualshelfcontents and virtualshelves
tables.  In the virtualshelfcontents table the 'flags' field has
been left undocumented since there is no data stored in this
field.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document z3950servers table
Nicole C. Engard [Sat, 27 Aug 2011 03:49:25 +0000 (23:49 -0400)]
Bug 6716 - Document z3950servers table

This patch documents the z3950servers table in Koha.  There are two
fields marked as unused (icon and description) and two fields that
were left undocumented because they contain data, but I am unsure
of where the data is coming from (position and type). A follow up
patch will be necessary to document these fields.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Documentation for the messages table
Nicole C. Engard [Sat, 27 Aug 2011 03:23:09 +0000 (23:23 -0400)]
Bug 6716 - Documentation for the messages table

This documents the messages table which stores info about the
circulation messages.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Documentation for the fieldmapping table
Nicole C. Engard [Fri, 26 Aug 2011 23:30:45 +0000 (19:30 -0400)]
Bug 6716 - Documentation for the fieldmapping table

This patch documents the fieldmapping table which contains the data
associated with the Keyword to Marc Mapping administration area.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document the systempreferences table
Nicole C. Engard [Fri, 26 Aug 2011 23:23:12 +0000 (19:23 -0400)]
Bug 6716 - Document the systempreferences table

This patch defines the systempreferences table.  Some of the fields
aren't actually used anymore with the new system preference editor,
but have been documented anyway.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document roadtype table
Nicole C. Engard [Fri, 26 Aug 2011 23:18:02 +0000 (19:18 -0400)]
Bug 6716 - Document roadtype table

This patch adds documentation to the roadtype table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document reviews table
Nicole C. Engard [Fri, 26 Aug 2011 23:15:00 +0000 (19:15 -0400)]
Bug 6716 - Document reviews table

This patch adds documentation to the reviews (or comments) table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Definition for the overduerules table
Nicole C. Engard [Fri, 26 Aug 2011 23:10:41 +0000 (19:10 -0400)]
Bug 6716 - Definition for the overduerules table

This patch defines the overduerules table which includes information
from the Overdue Notice Status Triggers Tool.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Document opac_news table
Nicole C. Engard [Fri, 26 Aug 2011 23:05:02 +0000 (19:05 -0400)]
Bug 6716 - Document opac_news table

Definiton for the opac_news table which stores date from the
news tool in Koha.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716: Documentation for the letter table
Nicole C. Engard [Sun, 21 Aug 2011 13:01:01 +0000 (09:01 -0400)]
Bug 6716: Documentation for the letter table

This patch documents the letter/notices table in Koha.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716: Documentation for the itemtypes table
Nicole C. Engard [Sun, 21 Aug 2011 12:55:33 +0000 (08:55 -0400)]
Bug 6716: Documentation for the itemtypes table

This patch defines the itemtypes table.  The definiton
for the summary field is a bit of guess based on the
description in the staff client, and might need some
clarification.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716: DB Documentation for the branchrelations table
Nicole C. Engard [Sun, 21 Aug 2011 12:47:05 +0000 (08:47 -0400)]
Bug 6716: DB Documentation for the branchrelations table

Documents the branchrelations table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Definition of the branchcategories table
Nicole C. Engard [Sun, 21 Aug 2011 12:44:29 +0000 (08:44 -0400)]
Bug 6716 - Definition of the branchcategories table

This patch adds field definitions to the branchcategories
table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Statistics Table Documentation
Nicole C. Engard [Sun, 14 Aug 2011 22:35:02 +0000 (18:35 -0400)]
Bug 6716 - Statistics Table Documentation

This patch documents the statistics table. A few fields were left
undocumented.

'other' - unclear what this is used for
'proccode' - unclear what the number entered in this field stands for
'usercode' - always NULL on my system
'associatedborrower' - always NULL on my system

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Issues Table Documentation
Nicole C. Engard [Sun, 14 Aug 2011 21:42:41 +0000 (17:42 -0400)]
Bug 6716 - Issues Table Documentation

This patch documents the issues and old_issues tables.  Two fields in
both tables are left undocumented - issuingbranch and return - because
I was unable to determine what data should be stored in these fields,
they are always NULL on my install. Feel free to edit with accurate
information.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Merge conflict fixed

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Cities Table Documentation
Nicole C. Engard [Sun, 14 Aug 2011 21:34:29 +0000 (17:34 -0400)]
Bug 6716 - Cities Table Documentation

Docmenting the cities table.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Borrower Attributes Tables
Nicole C. Engard [Sun, 14 Aug 2011 21:22:02 +0000 (17:22 -0400)]
Bug 6716 - Borrower Attributes Tables

This patch defines the borrower attributes tables (borrower_attributes
and borrower_attribute_types).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug6716 - File Cleanup
Nicole C. Engard [Sun, 14 Aug 2011 18:47:34 +0000 (14:47 -0400)]
Bug6716 - File Cleanup

The file was missing the starting comments before a few tables,
this patch adds those in for consistencies sake.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 Documenting two Branch Group tables
Nicole C. Engard [Sun, 14 Aug 2011 18:28:31 +0000 (14:28 -0400)]
Bug 6716 Documenting two Branch Group tables

This patch documents the branchcategories table and the
branchrelations table. Both tables are used in the library/
branch groups administration.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Branch table documentation
Nicole C. Engard [Sun, 14 Aug 2011 18:08:00 +0000 (14:08 -0400)]
Bug 6716 - Branch table documentation

Documenting the branches table in Koha.  Two unused fields noted, please update
if they are in fact used.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - Deleted Biblio Table
Nicole C. Engard [Sun, 14 Aug 2011 17:49:11 +0000 (13:49 -0400)]
Bug 6716 - Deleted Biblio Table

This patch documents the deletedbiblio table, with the exception of the
seriestitle field which I could not find an example of.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 3498 [ENH] Allow Partial Payment of Fines
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>
8 years agoAdding the 155th developer to the history
Chris Cormack [Mon, 12 Sep 2011 02:53:21 +0000 (14:53 +1200)]
Adding the 155th developer to the history

8 years agoBug 6716 - Deleted Borrowers MySQL
Nicole C. Engard [Sun, 14 Aug 2011 17:42:29 +0000 (13:42 -0400)]
Bug 6716 - Deleted Borrowers MySQL

Copied documentation from Borrowers to Deleted Borrowers table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoMerge remote-tracking branch 'kc/master' into new/enh/bug_6716
Chris Cormack [Mon, 12 Sep 2011 01:58:53 +0000 (13:58 +1200)]
Merge remote-tracking branch 'kc/master' into new/enh/bug_6716

8 years agoWhile testing the commits for 6716 I discovered a couple of missing
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

8 years agoBug 6716 - MySQL Table Documentation - Biblio Table
Nicole C. Engard [Sun, 14 Aug 2011 17:20:05 +0000 (13:20 -0400)]
Bug 6716 - MySQL Table Documentation - Biblio Table

This patch documents the biblio table, with the exception of the
seriestitle field which I could not find an example of.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6716 - MySQL definition for authorised values table
Nicole C. Engard [Sun, 14 Aug 2011 16:55:51 +0000 (12:55 -0400)]
Bug 6716 - MySQL definition for authorised values table

This is one of many patches that will document the MySQL table
structure for Koha. This patch adds comments to the
authorised_values table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Add comments to the SQL only, recreated table, works fine

8 years agoBug 6716 - Document Borrowers Table
Nicole C. Engard [Wed, 10 Aug 2011 22:06:51 +0000 (18:06 -0400)]
Bug 6716 - Document Borrowers Table

This is the first of many patches that will document the SQL structure
in Koha. This patch adds comments to the borrowers table.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- dropped current database
- recreated database using the webinstaller
> borrowers table all ok

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
8 years agoBug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
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>
8 years agoBug id:6783 - Circulation restrictions dont work when other withdrawn reasons are...
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>
8 years agoFollow up to Bug 6857: Change language from 'reserve' to 'hold'
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>
8 years agoBug 6857: display a charge warning alert for reserves
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>
8 years agoBug 6861: Fast Add returns to circ/circulation.pl in all cases
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>
8 years agoMerge remote-tracking branch 'kc/new/bug_6863' into kcmaster
Chris Cormack [Sat, 10 Sep 2011 09:40:09 +0000 (21:40 +1200)]
Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster

8 years agoBug 6863: Shelf Browser images not showing up
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>
8 years agoBug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
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>
8 years agoBumpding database version
Chris Cormack [Sat, 10 Sep 2011 09:35:49 +0000 (21:35 +1200)]
Bumpding database version

8 years agoEnh 6165: Add OPACResultsSidebar system preference
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>