Commit graph

4340 commits

Author SHA1 Message Date
Alex Arnaud
f0233c4f33 (MT2371) basket.tmpl, in basket details, change Open on => Opened on
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:29:11 -04:00
Alex Arnaud
e44fc909ef (BUG #4356) Basket.pl: adding a link to the basketgroup
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:27:44 -04:00
Jean-André Santoni
7233544f8b Select in budget add forum
Sorted the branches select.
Modified display to "branchcode - branchname"
Fixed a bug, selection was inverted.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 14:22:34 -04:00
39c177e3f2 bug 3344: display in-transit status on holds priority list
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 07:55:35 -04:00
a9c90b6dfb Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:54:54 -04:00
20140de43e Fix for Bug 4821, With multiple 5XX fields, the font display gets progressively smaller
Prevent the generation of empty label spans for various
bib details fields.  A construct like

<span class="results_summary"><span class="label" />contents note</span>

is consistently misinterpreted in many web browsers, leading to
CSS oddities.  See the bug for more details.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:33 -04:00
884d7099e9 Partial fix for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
This patch improves the template logic specifying a layout
based on whether the display is XSLT or normal, and whether
Amazon Content is on or off. Previously XSLT view did not
display Amazon covers when enabled.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:31 -04:00
d3b07c1889 More fixes for Bug 4423, Staff Client XSLT is just a copy of the OPAC one
- Adding material type icons from the OPAC side
- Adding OPAC View link
- Copying revised handling of MU from the OPAC
- Removing OPAC-specific markup

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:29 -04:00
8a9b4f0695 Followup fix for Bug 4453: Removing invalid template fragment.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:23 -04:00
4d8863bbdb Fix for Bug 4278, canceling vendor add refreshes wrong
Patch corrected to follow HDL's suggestion that link check
for existing vendor id and conditionally redirect based
on that.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:22 -04:00
3bae1c1dca Fix for Bug 3895 - Menu on left of Contracts is for Admin Pages
- Also adding cancel link to the add/edit view
- Also adding message when there are no contracts to list

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:50:20 -04:00
5944bd56fa Fix for Bug 4859, Formatting cleanup for merge biblio record interface
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:42:39 -04:00
Katrin Fischer
1ea703d869 Bug 4474 swap options for sys pref singleBranchMode
Resend with corrected spelling.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:12 -04:00
Katrin Fischer
2859e19155 Bug 4902: Add missing b_phone and b_email to borrower details
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:06 -04:00
Nicole Engard
10f362fbf5 bug 4900: add in missing value for usedaysmode pref
The usedaysmode preference was missing the option to
calculate due date by finding the next open date on the
calendar instead of ignoring all days the library is
closed.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:32:04 -04:00
4e6a664fb0 Fix for Bug 4868 - Improve controls for cloning and deleting MARC subfields
Changes "+" and "-" controls to actively linked images giving
better feedback about their clickability and an increased click
target area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:23:26 -04:00
2fe930dae2 Page structure correction, helps Bug 3850 (Page Need Design Work)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:16:26 -04:00
Katrin Fischer
a18bdb0bfe BUG 4883: Staff - remove \n from strings for translation
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:09:09 -04:00
Garry Collum
b717110c14 But 4890: Fixes invalid XHTML in basket.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:13 -04:00
Garry Collum
8876393d16 Bug 4889: Fixes minor XHTML error in booksellers.tmpl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:12 -04:00
Garry Collum
1e9c425950 Bug 4827: Fixes library drop-down list in aqbudgets.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:58:11 -04:00
0700a8b732 bug 4896: granular permissions now always on (DB rev 138)
Per the following koha-devel thread, the use of
staff user subpermissions, AKA granular permissions, is
now the default behavior in Koha.  This patch removes
the GranularPermissions system preference.

[1] http://lists.koha-community.org/pipermail/koha-devel/2010-February/033670.html

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:56:03 -04:00
Chris Cormack
ac5047b887 Follow up patch, removing missed conflict marker
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:50 -04:00
Chris Cormack
b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
Liz Rea
aa3ac3e319 Changing <p> to <span> per gmcharlt's suggestion re: Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:40:57 -04:00
Liz Rea
24b8e9c384 Adding <p class="noholdstext"> tag around the "No Holds Allowed" text to allow for jquery selection/replacement of the text.
A later patch might come that changes the text entirely, as it does not match the OPAC, and is often confusing for staff.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-17 19:40:56 -04:00
77f04bd426 Bug 2789 Fix UNIMAC leader plugin
The plugin was returning a 25 characters length leader rather than 24
characters. So leader was recreated automatically, removing user update,
before writing biblio record.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-09 10:14:11 -04:00
Henri-Damien LAURENT
39d70cf05b MT2938 : Adds a permission for editing items
This patch adds a permission on edit_items

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 21:04:01 -04:00
6af71b5f8d Fix for Bug 3722 - Branch deletion results in incorrect message
A fix was submitted by Nahuel on 23 Nov 2009 and pushed, but
it combined messages for existing patrons and existing items.
This patch defines separate messages for the various cases and
corrects a typo in the original fix which left existing patrons
unreported.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:46:31 -04:00
d346179a9b Fix for Bug 3926, inadvertantly resurrected by me.
The template-side fix for Bug 3926 was overwritten by
another template change I submitted later. My bad.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:36:33 -04:00
c6b94ab730 Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:25:43 -04:00
Nicole Engard
c4f7259cc1 bug 4205 remove extra 'plan by' option
There wasn't a conditional in place to stop the planning
pull down from showing a blank 'plan by' option.

This patch also makes the other 'plan by' options look
cleaner by removing the all caps.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 20:04:23 -04:00
Nicole Engard
5bdbd73f63 bug 4845 change language from reserves to holds
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 19:50:07 -04:00
Nicole Engard
a1d5033849 bug 4445 update OCLC text tips on preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:54:55 -04:00
Nicole Engard
aeabfb69a3 bug 4834 split joined preferences
these prefs : FilterBeforeOverdueReport & DisplayClearScreenButton shouldn't be
lumped together - they do two very different things and have nothing to do with
each other.

this patch splits them into two individual preferences.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:54:53 -04:00
Nicole Engard
8f1a6ad3de bug 4027 fix testStatus typo to textStatus
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-03 07:52:29 -04:00
bef0899742 Whitespace removal, removal of U+FEFF character
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-26 14:52:37 -04:00
Cindy Murdock Ames
ad2babecf3 Added "dialog alert" class to "No Results Found" message on the patron
search so the alert stands out.  Previously no css was applied to it so
it was just plain text.  Librarians weren't noticing it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-26 12:56:26 -04:00
Garry Collum
c45ddf7ff7 Bug 4199: Adds ability to print routing slip. Patch 2.
Previous patch added an invalid XHTML element.  This patch fixes it.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:59 -04:00
Garry Collum
e6a416a847 Bug 4199: Adds ability to print routing slip from serials-collection.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:52:58 -04:00
Garry Collum
59622c22da Bug 4805: Fixes multiple subscriptionid's being passed to serials-collection.
This is a replacement patch for my previous patch.

This patch insures that only unique subscriptionids are defined in the serials-edit form.  Multiple ids are passed to serials-collection, but not multiple copies of the same id.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 15:46:14 -04:00
f243b83ec0 bug 4018: remove duplicate unAPI link when XSLT bib details display on
The unAPI link is now added only in opac-detail.tmpl.  More than
one unAPI link in the same page was causing a bit of indigestion
for Zotero, which interprets multiple unAPI links as specifying
more than one resource on a given page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-25 09:29:31 -04:00
fdd2879988 Revert "(bug #3798) fix changing request branch"
This reverts commit ad01b57bcc.

This commit had introduced bug 4526.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 11:00:41 -04:00
ed2348dd95 Corrected: Fix for Bug 4529, columns on circ history all screwy
- fix formatting of last renew date
- Add table zebra striping
- Other markup structure changes
- Revised template assumes that issues.branchcode == checkout library and displays
  that value instead of issues.issuingbranch (which is always empty, see Bug 2806)
  issues.branchcode seems to reflect the item's holding branch *after* having
  been updated as part of the checkout transaction.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 10:43:28 -04:00
Colin Campbell
47a29c2bef Bug 4510 Script processes single supplier not an array
Script was written as though it had an array rather than
a single supplier. Replaced the excess punctuation with a single
supplier variable

replaced the C-style currency loop with a simpler perl-style one
we only need 1 loop not multiples
Changed variable name $GST to $tax_rate it's not magical and not a constant
and we all know what tax is
Fetch Contract data once rather than twice from two different modules
Correct size of discount data on display

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:37:42 -04:00
Nahuel ANGELINETTI
3fac59ba6b (bug #4522) fix plugin unimarc 210$c
This patch change the way to retrieve the value to insert in the record.
The way it was done, was verry ugly.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 09:14:34 -04:00
82c3c3df6c Fix for Bug 4534, Box for SQL not visible in "Create Report from SQL"
Changed style of SQL box and altered markup for a somewhat
cleaner layout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 08:43:51 -04:00
8e23cbc28f bug 4464: properly check if a subfield is populated if it is in a textarea
Subfields whose contents are longer than 100 characters are represented on the
bib form using a <textarea> instead of a text <input>.  The check on whether
at least one subfield for a mandatory field is populated wasn't not
checking for <textarea> subfields.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 07:55:07 -04:00
Garry Collum
1dfc81a45e Bug 2889: Adds highlighting to serials-collection.tmpl
Also fixes inconsistencies in the capitalization in the headings.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 07:55:05 -04:00
Garry Collum
db1516269d Bug 3910: Removes an erroneous heading from the serials search results.
Removes the 'Search for Serial Routing' heading from the serials search result screen.

There is no code in the template that performs a routing search, and links to the routing tables are provided in the serials search results.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 07:55:03 -04:00
Nicole Engard
6698c32ba5 bug 4802 - fix swapped files in acq help
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-21 23:09:33 -04:00
Nicole Engard
eb275234a5 bug 4802 add missing order search help file
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-21 10:29:59 -04:00
Nicole Engard
a1ee3db962 bug 4802 add new acq help files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-21 10:29:37 -04:00
Nicole Engard
c4f2ce91ed update main page help file
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-21 10:29:33 -04:00
8c66717a66 fix XHTML error in bib details print page
"&nbsp;" is not subtitutable for a table row

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-19 11:40:28 -04:00
Nahuel ANGELINETTI
8b4d76997f (bug #4519) fix record printing
this add a js that print a record

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-19 11:35:01 -04:00
Garry Collum
b1e8000d18 Bug 4525: Invalid XHTML in currency.tmpl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-19 11:27:16 -04:00
7f700bd461 Bug 4516 (Character shift in MARC21 Field 008)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 10:36:19 -04:00
Chris Nighswonger
206e1b53b6 Enhancement Bug 4444: Centralize Code Handling Perl Dependencies
Porting about.pl over to use C4::Installer::PerlModules

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 09:01:51 -04:00
Chris Nighswonger
e03d6bc77e Enhancement Bug 4444: Centralize Code Handling Perl Dependencies
Porting install.pl over to use C4::Installer::PerlModules

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 09:01:49 -04:00
60be9d291f bug 4509: remove references to PINESISBN system preference
This system preference never worked; also, as far as I can tell,
the PINES oISBN service was experimental, not meant for production
use, and is not currently advertised.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-17 08:59:10 -04:00
e5c430c63e fix XHTML error in about.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-14 08:41:24 -04:00
Katrin Fischer
cc5b30d799 BUG 4499: Javascript error messages not translatable
- Administration > Patron categories > New Category (category.tmpl)
- Circulation > Checkouts > Toolbar (all tabs except Check out) (members-toolbar.inc)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-13 18:52:07 -04:00
Katrin Fischer
d7e519bd64 BUG 4499: Javascript error messages not translatable
- Cataloging > New Record (addbiblio.tmpl)
- Administration > Currencies > New Currency (currency.tmpl)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-13 14:20:05 -04:00
bf1d430622 Fix for Bug 4485, System preferences page uses non-standard warning style
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 10:25:39 -04:00
Matthias Meusburger
6710641eee MT2582: Fix user deletion without permission
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 08:39:19 -04:00
Chris Cormack
853bc200b3 Follow up to bug3093 patch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:44:19 -04:00
Jane Wagner
dc0b98eb9e Bug 3093 add syspref to turn off multiholds button
Having the place multiple holds button at the top of the OPAC and staff search results has caused problems for some sites with tight holds policies; this syspref allows those sites to turn off the button.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:44:17 -04:00
J. David Bavousett
f0528664ee Bug 3928: Modification of date for serials.
When a serial status is changed to "Arrived" or "Claimed", the "Expected on"
date is changed to the current date.

A bit of rewriting to get it to apply on master - chris@bigballowax.co.nz

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 07:34:17 -04:00
Chris Cormack
fcb8469d18 Reserve and onloan were reporting the same cardnumber, due to a little bug in detail.pl fixed by this patch
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-11 06:04:39 -04:00
841da504e8 Further corrections for Bug 4244, Use "checkouts" instead of "issues"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-07 13:26:29 -04:00
Chris Cormack
5e2fcfd0b6 Adding new developers to the about page, need to do libraries next
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-06 19:58:27 -04:00
37e9cbc042 Fix for Bug 4416, renew all and return all buttons too close together
This patch removes the "return all" button altogether. Returning all items
is a step which one wouldn't take lightly or even regularly. Since the
interface has a means of selecting all checkboxes in the "Check in" column,
removing the "Return all" button wouldn't eliminate the means of doing so, it
would just require more deliberation.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:17:21 -04:00
7b11d2a281 Fix for Bug 4453, Improve formatting of batch item operations
- includes fix for Bug 4443
- includes some string changes, could resubmit without if these
  changes block inclusion in 3.2

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 11:14:07 -04:00
Ian Walls
74afd1ca8e Fixes bug 4452: CircControl syspref listed as ItemHomeBranch rather than ItemHomeLibrayr
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 10:14:48 -04:00
9329c40b6b fix template translation issues
Alternative to Henri-Damien's patch that does not
require putting CSS style information in the Perl code.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-05 09:28:08 -04:00
6969fefe4c Use CSS3 box-shadow property for Cart tooltip
The OPAC Cart tooltip ("Your cart is empty," "1 item(s) added to your
Cart") currently uses a jQuery plugin to generate a drop shadow.
This works cross-browser, but has a high failure rate with regard
to hiding the shadow consistently, resulting in an orphan shadow
after the tooltip has been hidden. I propose to instead use the
new CSS3 property "box-shadow" (-moz-box-shadow and -webkit-box-
shadow for FireFox and Safari/Chrome). Currently Internet Explorer
does not support this property. I think this is an
acceptable tradeoff for more stable functionality.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 11:19:03 -04:00
38b16e34fd fix various errors reported by xt/author/translatable-templates.t
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 08:36:21 -04:00
9cb86aec3b copy new NPL icons from OPAC to staff
Fixes problem found by xt/author/icondirectories.t

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:57:51 -04:00
717223a236 fix template structure error found by xt/author/valid-templates.t
Also fixed XHTML validity error

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-04 07:50:34 -04:00
Nicole Engard
bf380b8964 bug 4442 rename batch edit tools
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 14:00:17 -04:00
4bfeac67ed Fix for Bug 4436, reserve should say 'hold'
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 10:09:29 -04:00
Garry Collum
84dada43d3 Bug 2889: Added zebra striping to the table in dictionary.tmpl.
Also fixed a couple of minor XHTML errors.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:24:03 -04:00
Colin Campbell
cb031bace9 Bug 2889 Remove toggle in boraccount display
Also remove the reverse column if no contents to be displayed
( otherwise looks like a markup error )
Rationalize the main loop now toggle not required

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:20:50 -04:00
Michael Hafen
ea0c76af7f on checkout ask for confirmation if borrower from different branch
With IndependantBranches on check that the borrower is from the same branch as
the librarian.  If not then ask for confirmation.  This check is skipped for
SuperLibrarians.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 09:17:19 -04:00
d08cd6bfc0 Merge branch 'bug4036' of git://git.librarypolice.com/git/koha-galen into to-push 2010-05-03 07:46:33 -04:00
d575278cba bug 4036, 4405: overdue and fine day block improvements
* Adopted wording suggested by Kyle Hall for the
  USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE circulation blocks
* Updated IsMemberBlocked so that if a patron has accrued
  fine days, that will be tested for first before testing
  to see if the patron has current overdue items; this solves
  a problem introduced in the patch series for bug 4505 where
  accrued fine days would be ignored if (a) the patron has
  current overdue items but (b) the library has chosen to
  set the OverduesBlockCirc syspref to noblock.
* Now correctly assigns the USERBLOCKEDREMAINING and USERBLOCKEDOVERDUE
  blocks; prior to this patch, they had been swapped.

FIXME: IsMemberBlock ought to be split into two functions

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:46:26 -04:00
7bfd0461d4 bug 4396: remove reerences to bi_notforloan
These were causing the OPAC details place hold button to disappear
in circumstances where a bib-level item type was set to a non-loanable
item type even when item-level_itypes was on.

This change does mean that if item-level_itypes is not turned on,
the hold button will now appear for bibs whose bib-level item type
has its not-for-loan flag set; however, if this is a problem, a
better long-term fix would be to use CanBookBeReserved() instead.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:45:19 -04:00
Garry Collum
caec9fae40 Bug 4432: Fixes XHTML in serials-edit.tmpl.
Replaces a reference to an undefined variable, num, with a defined variable to create unique ids.

Also adds zebra striping to the table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:41 -04:00
Garry Collum
d2d2acd4a6 Bug 4200: Fixes adding a member to a routing list after filtering results.
Adds a hidden field for subscriptionid to the filter form.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-03 07:35:40 -04:00
b7a5bbefe8 bug 4505 followup - template changes
* fix syntax error
* adjust wording - "patron" instead of "borrower"
* handle case where overdue items should require
  confirmation of loan by operator
* fix typo in system preference template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:59:05 -04:00
Chris Cormack
86fbe2ec21 Bug 4405 - Overdues block check out
[Documentation note by RM:

This patch adds a new system preference, OverduesBlockCirc,
that can take one of three values:

  - noblock:      checkouts permitted even if patrons
                  have overdue items (default)
  - confirmation: circ operator asked to confirm checkout
  - block:        checkouts to patrons who have overdue
                  items are forbidden

]

Squashed commit of the following:

commit 6a1f66e0686a14d8a89abfc3fe5978dabd0b7af7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:27:39 2010 +1200

    Tidy up ready to send patch

commit 4d1398df18dcce4fd888cf17a0e2955fdf6ee1e4
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:26:15 2010 +1200

    Bug 4405 - tidy up

commit 3daeb71bc6b690e18dda96aa3c767c2bb0521038
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Mon Apr 26 10:02:04 2010 +1200

    Bug 4405 - Overdues block checkout

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 10:39:11 -04:00
Henri-Damien LAURENT
208b835310 MT3499 : cataloguing authid not reported
authid would not be correctly updated in bibliorecord.
Biblio record would not receive the correct authid in subfield 9
but some erroneous data

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:11:47 -04:00
Garry Collum
d85f607a6a Bug 4428: fixes minor XHTML errors in shelves.tmpl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-01 09:06:46 -04:00
3691a134e6 Fix for Bug 4409, I18N/L10N tab not highlighted
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:43 -04:00
23b52df1d7 Markup corrections to fix for Bug 4248
- Missing "=" in attribute
- TMPL_IF nested in HTML tag, which breaks translation script

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 17:05:41 -04:00
Matthias Meusburger
b0cd6429b0 Adds missing hint for upload-type syspref
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:50:26 -04:00
Sébastien Hinderer
343cc42eea Fix typo admin/in brnaches template.
The branch notes were not displayed because the variable was called
branchnotesl rather than branchnotes

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 06:47:46 -04:00
Nahuel ANGELINETTI
ad01b57bcc (bug #3798) fix changing request branch
a variable was wrong in template.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:54:04 -04:00
Nicole Engard
50375be1f2 BUG 3715 added state to label
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 00:15:31 -04:00