Commit graph

14857 commits

Author SHA1 Message Date
Katrin Fischer
1859858af6 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>
2011-09-13 09:25:59 +12:00
Katrin Fischer
18844d6bf1 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>
2011-09-13 09:25:03 +12:00
Katrin Fischer
75bfa2a56a 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>
2011-09-13 09:24:23 +12:00
Chris Cormack
35e3aa9a37 Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster 2011-09-13 09:08:50 +12:00
Nicole C. Engard
6a6edfeec8 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>
2011-09-13 09:08:06 +12:00
Nicole C. Engard
87f60acf9a Bug 6716 - Define reports_dictionary table
This patch documents the reports_dictionary table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:07:42 +12:00
Nicole C. Engard
5a2ec51e92 Bug 6716 - Document holiday tables
This patch documents the special_holidays and repeatable_holidays
tables.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:07:20 +12:00
Nicole C. Engard
f869d8d489 Bug 6716 - Document subscriptionroutinglist table
This table holds information related to serials routing lists.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:07:03 +12:00
Nicole C. Engard
3b581039a9 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>
2011-09-13 09:06:48 +12:00
Nicole C. Engard
5d413a7a9b 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>
2011-09-13 09:06:24 +12:00
Nicole C. Engard
c590d8f882 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>
2011-09-13 09:05:05 +12:00
Nicole C. Engard
228703d482 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>
2011-09-13 09:02:49 +12:00
Nicole C. Engard
ce1f5d14d7 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>
2011-09-13 09:02:15 +12:00
Nicole C. Engard
fb34448082 Bug 6716 - Document roadtype table
This patch adds documentation to the roadtype table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:01:59 +12:00
Nicole C. Engard
dd61aaa153 Bug 6716 - Document reviews table
This patch adds documentation to the reviews (or comments) table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 09:01:39 +12:00
Nicole C. Engard
17c68507a4 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>
2011-09-13 09:01:24 +12:00
Nicole C. Engard
6d4c8e117f 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>
2011-09-13 09:01:05 +12:00
Nicole C. Engard
5fb875127c 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>
2011-09-13 09:00:38 +12:00
Nicole C. Engard
a10402086b 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>
2011-09-13 08:59:08 +12:00
Nicole C. Engard
f52965559b Bug 6716: DB Documentation for the branchrelations table
Documents the branchrelations table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-13 08:58:43 +12:00
Nicole C. Engard
24b3f36b5b 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>
2011-09-13 08:57:32 +12:00
Nicole C. Engard
20c6bd0c4d 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>
2011-09-13 08:55:51 +12:00
Nicole C. Engard
91b5a09c6c 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>
2011-09-13 08:54:50 +12:00
Nicole C. Engard
522fecb6c5 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>
2011-09-13 08:51:25 +12:00
Nicole C. Engard
5c888890f4 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>
2011-09-13 08:50:08 +12:00
Nicole C. Engard
7420cb7186 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>
2011-09-13 08:49:10 +12:00
Nicole C. Engard
0fbb15cf46 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>
2011-09-13 08:48:46 +12:00
Nicole C. Engard
8a8654ffef 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>
2011-09-13 08:47:49 +12:00
Nicole C. Engard
508c46d1bc 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>
2011-09-13 08:47:12 +12:00
Colin Campbell
507c7f4224 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>
2011-09-13 08:40:49 +12:00
Chris Cormack
755390b5f5 Adding the 155th developer to the history 2011-09-12 14:53:21 +12:00
Nicole C. Engard
a7e1a37de0 Bug 6716 - Deleted Borrowers MySQL
Copied documentation from Borrowers to Deleted Borrowers table.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-12 14:00:43 +12:00
Chris Cormack
37e8229661 Merge remote-tracking branch 'kc/master' into new/enh/bug_6716 2011-09-12 13:58:53 +12:00
Chris Cormack
d6417257fd While testing the commits for 6716 I discovered a couple of missing
drop tables, fixed now
2011-09-12 13:57:19 +12:00
Nicole C. Engard
63d4de37c5 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>
2011-09-12 13:51:24 +12:00
Nicole C. Engard
990e9dbd9d 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
2011-09-12 10:16:28 +12:00
Nicole C. Engard
35e49bcb8e 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>
2011-09-12 10:13:54 +12:00
Magnus Enger
b3b6278e20 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>
2011-09-12 10:10:46 +12:00
Meenakshi.R
073f4fa7c3 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>
2011-09-11 21:40:09 +12:00
Nicole C. Engard
a9eb0c658a 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>
2011-09-11 21:36:15 +12:00
Robin Sheat
4c1d203980 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>
2011-09-11 21:35:52 +12:00
Ian Walls
c183981770 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>
2011-09-11 21:32:30 +12:00
Chris Cormack
bf2ba7a764 Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster 2011-09-10 21:40:09 +12:00
Ian Walls
b49534ebdc 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>
2011-09-10 21:39:15 +12:00
Ian Walls
156a849aa3 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>
2011-09-10 21:37:47 +12:00
Chris Cormack
13db3b62a0 Bumpding database version 2011-09-10 21:35:49 +12:00
Ian Walls
ba2c61b1b6 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>
2011-09-10 21:32:47 +12:00
Robin Sheat
99056625b6 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>
2011-09-08 13:46:46 +12:00
Chris Cormack
073083ea5f Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster 2011-09-08 13:36:51 +12:00
fb781f2dcd 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>
2011-09-08 13:35:56 +12:00