Commit graph

2895 commits

Author SHA1 Message Date
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
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
f64aaf063e 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>
2011-09-07 20:59:26 +12:00
Chris Cormack
34b553d03b 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>
2011-09-07 09:06:03 +12:00
Chris Cormack
4363ff6669 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>
2011-09-07 09:05:26 +12:00
Chris Cormack
e71b4faf78 Bug 6732 : Showing the bibliographic title on the manual invoices line
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-09-07 08:51:20 +12:00
Chris Cormack
f09e840311 Updating about file and history doc 2011-09-07 08:49:31 +12:00
Chris Cormack
9e93266714 Updating history and about file 2011-09-04 20:49:09 +12:00
Paul Poulain
f6d3cb05dd 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>
2011-09-04 20:04:13 +12:00
Christophe Croullebois
b2138a7ec6 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>
2011-09-04 20:03:37 +12:00
ca16532ea8 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>
2011-09-03 20:46:25 +12:00
Alex Arnaud
ca1906f9c6 Bug 4966 - follow up - add xhtml closure for input tags
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-09-03 07:01:07 +12:00
Nicole C. Engard
bb958cc613 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>
2011-09-03 07:00:46 +12:00
Alex Arnaud
955450dd1b 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>
2011-09-03 06:59:49 +12:00
Chris Cormack
6be9d2b27d Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster 2011-09-01 21:28:41 +12:00
Ian Walls
cb6c40faf7 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>
2011-09-01 21:26:26 +12:00
Chris Cormack
720e3012a8 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>
2011-09-01 21:10:02 +12:00
Maxime Pelletier
6756581cf8 Bug 6794 : Fixing a bug with member flags in IE
Rebased for template toolkit

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2011-09-01 21:02:38 +12:00
Chris Cormack
e39de04020 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>
2011-09-01 20:55:16 +12:00
Chris Cormack
ff4b179e14 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>
2011-09-01 20:50:47 +12:00
preprod34
390d1d5be6 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>
2011-08-28 19:54:36 +12:00
Chris Cormack
61758c8bcb Updating about page and history 2011-08-28 19:47:22 +12:00
Chris Cormack
55326fc407 Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster 2011-08-28 19:34:25 +12:00
Chris Cormack
383d0d3a21 Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster 2011-08-28 19:34:18 +12:00
bd744e6f2a 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>
2011-08-28 19:33:16 +12:00
a94a9f7455 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>
2011-08-28 19:31:17 +12:00
3731ec80fc 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>
2011-08-28 19:27:49 +12:00
e73965c62f 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>
2011-08-27 19:41:39 +12:00
Colin Campbell
99b51e0318 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>
2011-08-27 19:40:02 +12:00
eb7456c685 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>
2011-08-27 19:35:44 +12:00
0cf959123e 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>
2011-08-26 15:13:38 +12:00
Chris Cormack
eac3046dd9 Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster 2011-08-26 15:12:32 +12:00
63d300191e Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2011-08-26 15:10:19 +12:00
Chris Cormack
589403d2e8 Bug 6748 - Add link to fast add framework while circulating, if a barcode is not found
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
2011-08-26 15:03:01 +12:00
Srdjan Jankovic
54d38461f0 Bug 6721 - improve searching in the acquisitions system
This allows a basket to be searched for by name or invoice number from
anywhere in the acquisitions system. It is accessible by clicking on
"orders search", clicking the '[+]' and filling in the basket or invoice
no. fields.

Author:    Srdjan Jankovic <srdjan@catalyst.net.nz>
Author:    Robin Sheat <robin@catalyst.net.nz>
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-08-26 11:34:27 +12:00
Nicole C. Engard
13fd914b08 bug 6538 update letter.pl help file
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-26 10:32:57 +12:00
54e0667b23 Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
The markup for the fields for enrollment period "in months" and "until date"
was non-standard I think because the two fields are supposed to be visually
and functionally linked (having the same purpose and being mutually
exclusive).

This patch changes the markup so that the two fields share a fieldset
having "choose one" as the legend. The "hint" is now hidden unless
it is triggered by the javascript validation on submit.

I wanted to trigger the validation of the two fields onblur instead
of just onsubmit, but found that the datepicker widget doesn't
consistently trigger a change or a blur event on that field.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- Layout problems are fixed
- Layout is more clear about choosing either 'In months' or 'Until date'
- Clear error message shows when you enter values in both fields

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-26 10:30:55 +12:00
7b2cd8e636 Follow-up to Bug 4868, Improve controls for cloning and deleting subfields
- Adding similar icons for cloning and deleting tags
- Adding icon for the "Tag editor" links ("...")

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
2011-08-26 10:25:18 +12:00
Frédérick Capovilla
4e44667cd6 Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.
If multiple issues are in the list, changing the status of any issue in
the table would always change the "Expected on" date of the first issue.
Modified the javascript so the date is modified on the correct row.

Reimplementation of Patch for 3.4.x
Patch for 3.2.x from Frédérick Capovilla

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-08-26 10:15:46 +12:00
7f884128f6 Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
Missed a couple of instances of the pagination menu on the
lists page. Previously the pagination links on the page
listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
unstyled. After this patch the links should be styled.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-25 12:05:29 +12:00
cbdb5a823a Fix for Bug 6728, Table sorter for receiving acquisitions
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-23 15:07:36 +12:00
Chris Cormack
b78004c8e1 Bug 6703 : Link to invoice broken 2011-08-22 14:05:05 +12:00
77e1a62efa Fix for Bug 6753, Markup corrections and improvements for label export window
The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.

To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-21 19:44:47 +12:00
02f1058a80 Fix for Bug 6754, Improve breadcrumbs on lists pages
Breadcrumb navigation on the lists pages should give the user links back to the
category of list they're viewing, public or private.

Patch changes this:

Lists -> Contents of (Your list)

To this:

Lists -> Your lists -> Contents of (Your list)

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-21 19:39:16 +12:00
714c8b924e Fix for Bug 6640, Locations not showing in circ reports
An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:

[% DEFAULT LibraryNameTitle="Koha Online" %]

Based on the T:T docs this appears to be the correct way of defining
a default value:

[% LibraryNameTitle or "Koha Online" %]

Reference:

http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET

Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 20:57:32 +12:00
bc5aa5281d Bug 6744 - Acknowledge the actual es-ES translators
es-ES translator credits are way outdated as of http://translate.koha-community.org/es/34

Regards
To+

Signed-off-by: Federico Rinaudo <frinaudo@infocpt.com.ar>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-18 11:12:28 +12:00
Christophe Croullebois
36f526a9a8 Bug 6116: Adding a child patron
When adding a patron who is a child, the default library is not set when defining a guarantor, this patch corrects the problem.
More, for children with no guarantors, the default branch is the editing branch.

BibLibre MT5795

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-17 10:13:54 +12:00
Alex Arnaud
6466f57197 Bug #6068 - New feature: capability to blanking subfields in BatchMod
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-16 09:10:54 +12:00
Colin Campbell
1a03a8a38e Bug 6181: Remove CGI Scolling lists from C4::Budgets
As noted on bug 766 more cases of usage of
CGI::scrolling_list were imported into C4::Budgets
Even if we were not trying to remove usage of this
the C4 modules are not the place to generate markup
Most of these routines are noise as they are not used in
any current code but cause confusion and increase
maintenance overhead. They are removed

The sort dropboxes on order create are the only
references in current templates to these routines
they have been replaced by a select list generated
by the markup.
They can probably be removed too but their existence
although the option that causes them to be displayed
seems unlikely to be set. I've left them pending
resolution of some of the inconsistencies and
confusions surrounding Budgts

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-08-14 20:24:31 +12:00