wip/koha-chris_n.git
9 years agoMerge remote branch 'kc/new/bug_2742' into kcmaster
Chris Cormack [Wed, 16 Feb 2011 22:41:36 +0000 (11:41 +1300)]
Merge remote branch 'kc/new/bug_2742' into kcmaster

9 years agoBug 2742 Followup patch fixing Norwegian bokmål, adding nynorsk
Magnus Enger [Tue, 15 Feb 2011 10:37:06 +0000 (11:37 +0100)]
Bug 2742 Followup patch fixing Norwegian bokmål, adding nynorsk

- Replace Norwegian with Norwegian bokmål
- Add Norwegian nynorsk, which was missing

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5462' into kcmaster
Chris Cormack [Wed, 16 Feb 2011 20:47:14 +0000 (09:47 +1300)]
Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

9 years agoFollow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit
Owen Leonard [Mon, 14 Feb 2011 07:49:07 +0000 (07:49 +0000)]
Follow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit

A change was made to MARCdetail.tmpl without making a corresponding
change to MARCdetail.pl. I've reworked the original change so that
both can work together.

0XX --> tab0XX

Apparently TMPL variables can't start with a number now?

MR: Recreated patch file to recover failure to apply.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5462' into kcmaster
Chris Cormack [Wed, 16 Feb 2011 19:56:43 +0000 (08:56 +1300)]
Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

9 years agoFollow up on Bug 5462: fixing variable names breaks messaging preference form
Ian Walls [Sat, 12 Feb 2011 22:19:23 +0000 (17:19 -0500)]
Follow up on Bug 5462: fixing variable names breaks messaging preference form

The messaging prefs form was hardcoded to use 'transport-$transport_type', rather than
'transport_$transport_type'.  The result was an uneditable messaging preferences form.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFollow-up fix for Bug 5760 - Add the jquery table sorter to reading record
Owen Leonard [Sun, 13 Feb 2011 01:55:09 +0000 (20:55 -0500)]
Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record

- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5760 : MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support...
Paul Poulain [Sat, 12 Feb 2011 09:19:31 +0000 (04:19 -0500)]
Bug 5760 : MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5759 : displaying 2nd email if there is one on print template for borrowers
Paul Poulain [Tue, 15 Feb 2011 00:52:35 +0000 (13:52 +1300)]
Bug 5759 : displaying 2nd email if there is one on print template for borrowers

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_2170' into kcmaster
Chris Cormack [Tue, 15 Feb 2011 02:55:54 +0000 (15:55 +1300)]
Merge remote branch 'kc/new/enh/bug_2170' into kcmaster

9 years agoFollow-up fix for Bug 2170 - Adding 'edititems' user-permission
Owen Leonard [Fri, 11 Feb 2011 04:52:26 +0000 (23:52 -0500)]
Follow-up fix for Bug 2170 - Adding 'edititems' user-permission

Save button and duplicate confirmation redirects must respect
the edititems permission: Users without permission to edit items
should not be redirected to the edit items screen.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5756: Add MARC21 tag 751 (added geographical entry) to Zebra config
Marcel de Rooy [Mon, 14 Feb 2011 17:14:40 +0000 (17:14 +0000)]
Bug 5756: Add MARC21 tag 751 (added geographical entry) to Zebra config

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoPartial fix for Bug 5745, Overdues with fines report not showing titles
Owen Leonard [Sat, 12 Feb 2011 03:22:16 +0000 (22:22 -0500)]
Partial fix for Bug 5745, Overdues with fines report not showing titles

- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5736' into kcmaster
Chris Cormack [Mon, 14 Feb 2011 21:09:05 +0000 (10:09 +1300)]
Merge remote branch 'kc/new/bug_5736' into kcmaster

9 years agoFollow up on 5736: fix authorities record.abs
Marcel de Rooy [Mon, 14 Feb 2011 16:24:18 +0000 (16:24 +0000)]
Follow up on 5736: fix authorities record.abs

Follow up on 5736: Same problem with 100 and 100a in authorities/record.abs

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_2742' into kcmaster
Chris Cormack [Mon, 14 Feb 2011 21:04:43 +0000 (10:04 +1300)]
Merge remote branch 'kc/new/bug_2742' into kcmaster

9 years agoFollow up on bug 2742: Correct language names in install
Marcel de Rooy [Mon, 14 Feb 2011 11:19:16 +0000 (11:19 +0000)]
Follow up on bug 2742: Correct language names in install

Rename the phonetic name in about, just like an earlier patch did elsewhere.
Make the distinction between the two Dutch translations more clear.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5751 : Follow up patch, removing unused variable and fixing copyright
Chris Cormack [Sun, 13 Feb 2011 23:15:14 +0000 (12:15 +1300)]
Bug 5751 : Follow up patch, removing unused variable and fixing copyright

9 years agoBug 5751 : MT2690 fix members-home
Paul Poulain [Tue, 14 Dec 2010 20:34:25 +0000 (21:34 +0100)]
Bug 5751 : MT2690 fix members-home

This fix the members-home script to work with new letter search management, and delete not anymore used code/template

(written by Nahuel Angelinetti)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
9 years agoupdating some references from koha.org to koha-community.org
Paul Poulain [Tue, 14 Dec 2010 20:23:30 +0000 (21:23 +0100)]
updating some references from koha.org to koha-community.org

9 years agoMerge remote branch 'kc/new/bug_5734' into kcmaster
Chris Cormack [Sun, 13 Feb 2011 21:53:17 +0000 (10:53 +1300)]
Merge remote branch 'kc/new/bug_5734' into kcmaster

9 years agoBug 5734 (MT3625) Fix column order in issue history
Paul Poulain [Sun, 13 Feb 2011 21:48:56 +0000 (10:48 +1300)]
Bug 5734 (MT3625) Fix column order in issue history

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_5649' into kcmaster
Chris Cormack [Sun, 13 Feb 2011 21:33:41 +0000 (10:33 +1300)]
Merge remote branch 'kc/new/bug_5649' into kcmaster

9 years agobug 5649: changes the white/blacklisting to approved/rejected consistent wording
Schuster [Wed, 9 Feb 2011 03:16:05 +0000 (22:16 -0500)]
bug 5649: changes the white/blacklisting to approved/rejected consistent wording

Changes the wording to approved/rejected to be consistent with other wording

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5722, other reason for suggestions has code in text box
Owen Leonard [Wed, 9 Feb 2011 03:10:50 +0000 (22:10 -0500)]
Fix for Bug 5722, other reason for suggestions has code in text box

Input value attributes shouldn't have _() escaping.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5679 - funds planning showing strange borders
Owen Leonard [Wed, 9 Feb 2011 03:08:48 +0000 (22:08 -0500)]
Fix for Bug 5679 - funds planning showing strange borders

Table border style needed more specificity

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5715, Adding note about ReservesMaxPickUpDelay value
Owen Leonard [Wed, 9 Feb 2011 03:05:39 +0000 (22:05 -0500)]
Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay value

Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agobug 4306: respect item-level_itypes when displaying item label batches
Galen Charlton [Fri, 11 Feb 2011 12:56:28 +0000 (13:56 +0100)]
bug 4306: respect item-level_itypes when displaying item label batches

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Salvador Zaragoza Rubio <salvazm@masmedios.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5736: Fixing some zebra configuration errors in marc21/biblios/record.abs
Marcel de Rooy [Thu, 10 Feb 2011 17:12:17 +0000 (17:12 +0000)]
Bug 5736: Fixing some zebra configuration errors in marc21/biblios/record.abs

Lines like melm 999 should ALWAYS follow the lines for subfields 999a, 999b etc.
This is currently not the case for 410 411 490 611 710 785 and 800.
Found this since I could not find back the contents of 710$9 fields.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5735: Expanding/collapsing cloned fields in editor takes original field
Marcel de Rooy [Thu, 10 Feb 2011 17:30:31 +0000 (17:30 +0000)]
Bug 5735: Expanding/collapsing cloned fields in editor takes original field

Adds corrected onclick response for expanding marc tags.
Removes some lines that did not work as promised.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5727 Warning in log due to XSLT.pm
Frédéric Demians [Thu, 10 Feb 2011 17:42:53 +0000 (17:42 +0000)]
Bug 5727 Warning in log due to XSLT.pm

XSLT.pm add few syspref to MARCXML record send to be transformed by XSLT. If
one of those syspref doesn't exist, it generated a warning.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5230: Call number ranges in export don't give expected results.
D Ruth Bavousett [Fri, 11 Feb 2011 01:22:27 +0000 (20:22 -0500)]
Bug 5230: Call number ranges in export don't give expected results.

If you entered low number and high number, you got only items that *exactly* matched either entry (if any).
If you enter only a low number, you got everying *lower* than that.
If you enter only a high number, you get everything *higher* than that.

This was a greater-than-less-than problem.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5733' into kcmaster
Chris Cormack [Sun, 13 Feb 2011 20:29:19 +0000 (09:29 +1300)]
Merge remote branch 'kc/new/enh/bug_5733' into kcmaster

9 years agoFollow-up fix for Bug 5733 - Empty cart in intranet when session is closed
Owen Leonard [Fri, 11 Feb 2011 06:08:19 +0000 (01:08 -0500)]
Follow-up fix for Bug 5733 - Empty cart in intranet when session is closed

Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.

Removing unnecessary  "javascript:" pseudo-protocol.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5743, 5743 - Make login errors a little nicer
Owen Leonard [Fri, 11 Feb 2011 06:14:11 +0000 (01:14 -0500)]
Fix for Bug 5743, 5743 - Make login errors a little nicer

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMake 'about' show D Ruth Bavousett's name change
Katrin Fischer [Fri, 11 Feb 2011 23:53:53 +0000 (18:53 -0500)]
Make 'about' show D Ruth Bavousett's name change

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoCorrecting the name of one of the developers. :)
Liz Rea [Fri, 11 Feb 2011 23:54:40 +0000 (18:54 -0500)]
Correcting the name of one of the developers. :)

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_4263' into kcmaster
Chris Cormack [Sun, 13 Feb 2011 20:08:18 +0000 (09:08 +1300)]
Merge remote branch 'kc/new/bug_4263' into kcmaster

9 years agoBug 4263: Remove duplicated lines from C4::Items
Colin Campbell [Fri, 11 Feb 2011 11:48:20 +0000 (11:48 +0000)]
Bug 4263: Remove duplicated lines from C4::Items

Merge of bug 4263 duplicates the bulk of
ModItemFromMarc causing compile time errors

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4263: Fix subfield ordering broken by earlier patch
Colin Campbell [Thu, 10 Feb 2011 20:13:12 +0000 (15:13 -0500)]
Bug 4263: Fix subfield ordering broken by earlier patch

Restores alpha sorting of item subfields in add/edit screen

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5746: Add space after 'enhanced content' on OPAC
Nicole Engard [Sat, 12 Feb 2011 00:02:00 +0000 (19:02 -0500)]
Bug 5746: Add space after 'enhanced content' on OPAC

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5733 : MT3531: Intranet cart is emptied when session is closed
Paul Poulain [Tue, 14 Dec 2010 20:16:10 +0000 (21:16 +0100)]
Bug 5733 : MT3531: Intranet cart is emptied when session is closed

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5731 When No ccode is defined for an item, then moredetail.pl throws a 500 error
Paul Poulain [Tue, 14 Dec 2010 20:07:08 +0000 (21:07 +0100)]
Bug 5731 When No ccode is defined for an item, then moredetail.pl throws a 500 error

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5716 - Whitespace correction for browse shelf
Owen Leonard [Wed, 9 Feb 2011 01:58:14 +0000 (20:58 -0500)]
Fix for Bug 5716 - Whitespace correction for browse shelf

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/bug_3009' into kcmaster
Chris Cormack [Wed, 9 Feb 2011 02:27:01 +0000 (15:27 +1300)]
Merge remote branch 'kc/new/bug_3009' into kcmaster

9 years agoBug 3009 - Change items.content field so it prints due date by default
Katrin Fischer [Sat, 11 Dec 2010 20:43:57 +0000 (21:43 +0100)]
Bug 3009 - Change items.content field so it prints due date by default

<items.content> in overdue notices prints issuedate instead of duedate by default.
This patch changes default to issues.date_due.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoAdding id tags to some OPAC templates.
Koustubha Kale [Tue, 8 Feb 2011 15:49:00 +0000 (10:49 -0500)]
Adding id tags to some OPAC templates.

Many of the templates in OPAC, which deal with users data eg opac-account.tmpl, opac-passwd.tmpl etc do not have a id for the container div,
like opac-user.tmpl has an id userdetail. Having these id's makes it easier to customize with css.
This patch adds id's to most of the <div class="container"> tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoAdd markers to text in Javascript variable in order to be translate.
koha-preprod [Tue, 8 Feb 2011 14:14:36 +0000 (09:14 -0500)]
Add markers to text in Javascript variable in order to be translate.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5629 : Adding an HTML anchor in the link in order to choose the right tab when...
koha-preprod [Tue, 8 Feb 2011 14:28:41 +0000 (09:28 -0500)]
Bug 5629 : Adding an HTML anchor in the link in order to choose the right tab when we click on the link

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5702 : Adding if statement condition to highlight toggle
Brice Sanchez [Tue, 8 Feb 2011 13:59:45 +0000 (08:59 -0500)]
Bug 5702 : Adding if statement condition to highlight toggle

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoadding some copyright BibLibre statements
Paul Poulain [Tue, 4 Jan 2011 20:55:54 +0000 (21:55 +0100)]
adding some copyright BibLibre statements

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3495 : Providing a link to the fast add screen in circulation for an item that...
Chris Cormack [Wed, 9 Feb 2011 00:55:08 +0000 (13:55 +1300)]
Bug 3495 : Providing a link to the fast add screen in circulation for an item that isn't found

Squashed commit of the following:

commit bf7fb7971d2d6ea6b3ea09bda571bdc3399efb35
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Feb 9 13:53:38 2011 +1300

    Bug 3495 : Wrapping link to the fast cataloguing page with syspref and permissions

commit ae7e2c278e10efea94e19b75446d7fed25272de2
Author: Paul Poulain <paul.poulain@biblibre.com>
Date:   Wed Dec 15 20:50:45 2010 +0100

    Bug 3495 : Add link to Fast cataloguing in case the scanned barcode don't exist in circulation

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5726 : MT1059 Follow-up : Fix merge reference selection presentation
Paul Poulain [Wed, 15 Dec 2010 19:50:22 +0000 (20:50 +0100)]
Bug 5726 : MT1059 Follow-up : Fix merge reference selection presentation

    A change in global-staff.css messed the merge reference selection presentation

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5718 : fix permission of moveitem = edit_items needed
Paul Poulain [Wed, 15 Dec 2010 19:38:53 +0000 (20:38 +0100)]
Bug 5718 : fix permission of moveitem = edit_items needed

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 2742 : Fix typo
Chris Cormack [Tue, 8 Feb 2011 08:47:38 +0000 (21:47 +1300)]
Bug 2742 : Fix typo

9 years agoBug 5616: Corrects an utf-8 encoding problem in cardviews
Frédérick Capovilla [Mon, 7 Feb 2011 15:35:56 +0000 (10:35 -0500)]
Bug 5616: Corrects an utf-8 encoding problem in cardviews

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5701: Distinction between authors/additional authors in staff normal view (MARC21...
Marcel de Rooy [Mon, 7 Feb 2011 14:27:58 +0000 (09:27 -0500)]
Bug 5701: Distinction between authors/additional authors in staff normal view (MARC21/XSLT)

At this time all entries in 100/110/111 and 700/710/711 are shown together.
We want to see the difference between an author and an added entry. (The 700
author could for instance be an illustrator.)
To this end we like to see the eventual relator code or term in $4 or $e too
(displayed between brackets after the name).

In the patch the code for authors is moved to a template routine at the end of
the xslt stylesheet.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Tue, 8 Feb 2011 08:12:41 +0000 (21:12 +1300)]
Bumping database version

9 years agoBug 2742 Correct language names in install
Colin Campbell [Mon, 7 Feb 2011 17:16:00 +0000 (17:16 +0000)]
Bug 2742 Correct language names in install

Correct native versions of Danish and Dutch

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge remote branch 'kc/new/enh/bug_5462' into kcmaster
Chris Cormack [Tue, 8 Feb 2011 08:05:14 +0000 (21:05 +1300)]
Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

9 years agoFollow-up correction for Bug 5462 - Fix variable names for template::toolkit
Owen Leonard [Mon, 7 Feb 2011 22:09:01 +0000 (17:09 -0500)]
Follow-up correction for Bug 5462 - Fix variable names for template::toolkit

Previous commit modified checks for the item-level_itypes preference
to look for a different variable name but didn't update where that
variable is set in Auth.pm.

Other scripts perform a direct check of item-level_itypes and must
continue to use the name of the variable in the database.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5700: MT4004 : additem.pl Some Status were not defaulted to the correct value...
Paul Poulain [Wed, 15 Dec 2010 19:38:23 +0000 (20:38 +0100)]
Bug 5700: MT4004 : additem.pl Some Status were not defaulted to the correct value Status 0 was lost because test was done on value and not on the fact that a value was defined or not. when value is 0 then it was not used as default value for

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5699: don't discard $3 when building a record (UNIMARC specific)
Paul Poulain [Wed, 15 Dec 2010 19:37:15 +0000 (20:37 +0100)]
Bug 5699: don't discard $3 when building a record (UNIMARC specific)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge branch 'new/bug_5277' into kcmaster
Chris Cormack [Mon, 7 Feb 2011 08:13:56 +0000 (21:13 +1300)]
Merge branch 'new/bug_5277' into kcmaster

9 years agoBug 5691 - Delete all items respects independentbranches system preferences
Chris Cormack [Fri, 4 Feb 2011 00:45:57 +0000 (19:45 -0500)]
Bug 5691 - Delete all items respects independentbranches system preferences

Squashed commit of the following:

commit 66cdb8804136803a3f626d183c8f192f61f3c7b1
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:55:10 2011 +1300

    Bug 5691: Updating copyright statement

commit 79ef6c269afc9c644c51709a7657542a0fc6d7d6
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Fri Feb 4 12:52:13 2011 +1300

    Bug 5691 - Fixing a syntax error and tidying up some formatting

commit a66485dba113c05ed51a3b4ff19f788e335aa1f6
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Tue Oct 5 17:23:55 2010 +0200

    (MT #1365) Delete all items

    Using DelItemCheck in cataloguing/additem.pl
    when deleting all items

commit fe845fd48ab22ff82ad6d8971c468c327b49f3c4
Author: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date:   Wed Sep 22 11:39:28 2010 +0200

    (MT #1365) Delete all items

    Now if IndependantBranches is on and a user try to delete all items, only the items of his branch will be deleted.
    A message explain this fact.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Followup: (MT #1365) Fixing up the English idiom
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5532 - sysprefs editor should show names of saved prefs
Owen Leonard [Thu, 3 Feb 2011 23:53:15 +0000 (18:53 -0500)]
Fix for Bug 5532 - sysprefs editor should show names of saved prefs

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5689 - System preference notifications are not translatable
Owen Leonard [Thu, 3 Feb 2011 22:36:05 +0000 (17:36 -0500)]
Fix for Bug 5689 - System preference notifications are not translatable

Defining strings in the template so that they can be translated.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoFix for Bug 5115, Tags JavaScript includes many untranslatable strings
Owen Leonard [Thu, 3 Feb 2011 23:47:35 +0000 (18:47 -0500)]
Fix for Bug 5115, Tags JavaScript includes many untranslatable strings

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoMerge branch 'new/bug_5690' into kcmaster
Chris Cormack [Fri, 4 Feb 2011 00:23:46 +0000 (13:23 +1300)]
Merge branch 'new/bug_5690' into kcmaster

9 years agoBug 5690
Henri-Damien LAURENT [Thu, 3 Feb 2011 23:01:19 +0000 (18:01 -0500)]
Bug 5690

MT3947: items.timestamp were not updated on edition

If items.timestamp is used in the framework and hidden
the fact that it is NOT deleted before update is done would input the previous timestamp,
which is not the desired behaviour.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoUpdating history docs
Chris Cormack [Fri, 4 Feb 2011 00:21:20 +0000 (13:21 +1300)]
Updating history docs

9 years agoMerge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462
Chris Cormack [Thu, 3 Feb 2011 19:52:39 +0000 (08:52 +1300)]
Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462

9 years agoBug 5462: fixed current preferences tab highlighting bug created by dashfix
Christopher Hall [Sun, 28 Nov 2010 20:59:30 +0000 (09:59 +1300)]
Bug 5462: fixed current preferences tab highlighting bug created by dashfix

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoBug 5462: more dash fixing for variable names within scripts
Christopher Hall [Tue, 16 Nov 2010 02:42:25 +0000 (15:42 +1300)]
Bug 5462: more dash fixing for variable names within scripts

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoBug 5462: modified intranet scripts to match templates
Christopher Hall [Mon, 15 Nov 2010 03:06:24 +0000 (16:06 +1300)]
Bug 5462: modified intranet scripts to match templates

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoBug 5462: both intranet and opac seem to be 'clean', still need to make relevant...
Christopher Hall [Mon, 15 Nov 2010 02:47:00 +0000 (15:47 +1300)]
Bug 5462: both intranet and opac seem to be 'clean', still need to make relevant changes in scripts

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoBug 5462: fixed incorrect TMPL_IF
Christopher Hall [Fri, 12 Nov 2010 03:50:11 +0000 (16:50 +1300)]
Bug 5462: fixed incorrect TMPL_IF

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoBug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names
Christopher Hall [Fri, 12 Nov 2010 01:17:03 +0000 (14:17 +1300)]
Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names

Done within opac and intranet templates, still needs to be done for corresponding scripts.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
9 years agoFixing a syntax error, that snuck in with a merge
Chris Cormack [Thu, 3 Feb 2011 09:52:36 +0000 (22:52 +1300)]
Fixing a syntax error, that snuck in with a merge

9 years agoFix for Bug 3319 - Need error message when adding patron and libraries are defined
Owen Leonard [Tue, 17 Aug 2010 16:58:33 +0000 (12:58 -0400)]
Fix for Bug 3319 - Need error message when adding patron and libraries are defined

- Hiding patron add toolbar when branches or categories are undefined
- Blocking patron entry form if branches or categories are undefined
- Removing nonfunctional template logic for displaying missing category
  error message.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3212 Force leader 9 position to 'a' for new biblios
Frédéric Demians [Wed, 5 Jan 2011 10:45:52 +0000 (11:45 +0100)]
Bug 3212 Force leader 9 position to 'a' for new biblios

When Creating a new biblio record, if the cataloguer doesn't use the leader
plugin, a biblio record can be saved with a leader not containing a 'a' in 9
position. If the biblio contains UTF-8 characters, its decoding can fail.

This issue applies to MARC-21 not UNIMARC.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5673: test guarantorid consistently
Colin Campbell [Mon, 31 Jan 2011 16:19:49 +0000 (16:19 +0000)]
Bug 5673: test guarantorid consistently

Incorrect checking of guarantorid was causing moremember.pl to
try and construct addresses using data from non-existent guarantors
ensure that test is consistently checking that value is defined and not
'', '0' or 0 [ i.e. what perl does for you anyway!!]

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 2341: items marked 'on order' not reserveable from search results
Ian Walls [Mon, 31 Jan 2011 02:43:55 +0000 (21:43 -0500)]
Bug 2341: items marked 'on order' not reserveable from search results

Items created as part of the acquisitions process, and assigned the temporary notforloan value of -1,
cannot be placed on hold from the search results in either the OPAC or staff client (the link is missing).

This patch changes the evaluation of items->notforloan from a Boolean (if $items->{notforloan}) to a comparison
(if $items->{notforloan} > 0).  Any notforloan status with a negative value can therefore be reserved.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug: 4263 - Repeatable subfields in items
Chris Cormack [Thu, 3 Feb 2011 01:32:32 +0000 (20:32 -0500)]
Bug: 4263 - Repeatable subfields in items

Squashed commit of the following:

commit f441094d5095d165eab18340c983a831cce8f6e0
Author: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Date:   Mon Jul 5 20:33:23 2010 +0200

    bug4263 followup : Can't blank subfields

    Previous bug4263 reintroduced bug 2466: fix clearing item field
    This keeps bug4263 followup to be assigned (donot blank dateaccessioned)
    But also allow to blank item subfields.

commit 92889b766c41b48bdd0e3a33ca4b183b1e259805
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Apr 23 13:54:30 2010 +0200

    (bug #4263) dateaccessionned is cleaned on item modification

    Every item modification, date accessionned is cleaned, if there is no modification made, we must'nt reset to "undef" the value.

commit 5abb2db16b2564d32e84b7cc680acbc301d73179
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Mar 2 09:57:33 2010 +0100

    (bug #4263) fix the edition of items with repeatable subfields

    The subfield management in item level is broken, fields are concatenated in one field, and if the librarian edit it, the values are not selected.
    This big patch fix three things:
     1) saving fields that are stocked in SQL(using koha2marc mapping) are now well cut and separated in _REAL_ subfields
     2) loading records with repeatable subfields are now well returned
     3) Editing items with repeatable fields works well

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Bug 4263 Removing extranious block of code
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 4931: Stocking can be by homebranch or holding branch
Chris Cormack [Thu, 3 Feb 2011 00:40:10 +0000 (19:40 -0500)]
Bug 4931: Stocking can be by homebranch or holding branch

Squashed commit of the following:

commit 105de81639cbac5084e4a5c099b19569043e69ff
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Tue Jul 13 11:58:01 2010 +0200

    (bug #4931) fix forgottens input in buttons

    the previous patch missed an hidden input in next buttons that break next page. This fix it.

commit db00295a6b9d1d36fc888ba6a0558011fd6884ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date:   Fri Jul 2 15:27:59 2010 +0200

    (bug #4931) add the ability to choose home or holding branch in stocktaking

    This add radio box in stocktaking to base it on home or holdingbranch

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Bug 4391 Followup: Adding back lost declaration of $branchcode
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoUpdating history docs
Chris Cormack [Wed, 2 Feb 2011 21:32:54 +0000 (10:32 +1300)]
Updating history docs

9 years agoBug 5661 Fix a problem when doing an authority search with no sort order
Frédérick Capovilla [Wed, 2 Feb 2011 21:17:21 +0000 (16:17 -0500)]
Bug 5661 Fix a problem when doing an authority search with no sort order

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5681: Fixes leading zeroes in Add Mulpiple Copies
Paul Poulain [Wed, 15 Dec 2010 19:28:03 +0000 (20:28 +0100)]
Bug 5681: Fixes leading zeroes in Add Mulpiple Copies

From Biblibre:
I don't know why, but removing sprintf solves the problems with leading zeroes
and the problems with large values.

(written by jean-andré santoni)

Note from Chris:

The width is never set, so the sprintf always defaults to a float, which
trims the leading zeros. I am not smart enough to figure out how to set
a valid width when calling it, and removing the sprintf seems to work
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5681 for
test results

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5683 - it is possible to save corrupt records
Jared Camins-Esakov [Wed, 2 Feb 2011 16:47:49 +0000 (11:47 -0500)]
Bug 5683 - it is possible to save corrupt records

This patch makes it impossible to save records with variables fields that don't
contain any subfields. Prior to this patch, link_bibs_to_authorities.pl would
sometimes corrupt records.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBumping database version
Chris Cormack [Tue, 1 Feb 2011 06:43:21 +0000 (19:43 +1300)]
Bumping database version

9 years agoBug 4160: Currency conversion doesn't handle rates other than 100
Katrin Fischer [Mon, 31 Jan 2011 20:45:40 +0000 (15:45 -0500)]
Bug 4160: Currency conversion doesn't handle rates other than 100

Changes data type for currency.rate to accomodate bigger currency conversion rates.

FLOAT( 15, 5 )

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5665: Routing slip prints too wide for narrow printers
Reed Wade [Mon, 31 Jan 2011 10:14:08 +0000 (10:14 +0000)]
Bug 5665: Routing slip prints too wide for narrow printers

This patch switches off some min-width styling which causes right hand
of page to be clipped.

Work sponsored by Opus

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoRevised fix for Bug 3850 - Budget Planning Pages Need Design Work
Owen Leonard [Sun, 30 Jan 2011 14:42:18 +0000 (09:42 -0500)]
Revised fix for Bug 3850 - Budget Planning Pages Need Design Work

- Filter moved to left-hand sidebar consistent with other pages
- Export option moved to left-hand sidebar to improve visibility
- Show/hide column controls moved to their own role with clear labels
- "Locked" icon added to replace indicating locked status by row color

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 3881: Updating database version number
Chris Cormack [Mon, 31 Jan 2011 09:29:36 +0000 (22:29 +1300)]
Bug 3881: Updating database version number

9 years agoBug 3881 fixing italian sysprefs
Chris Cormack [Mon, 31 Jan 2011 09:26:04 +0000 (22:26 +1300)]
Bug 3881 fixing italian sysprefs

9 years agoBug 3881: OPAC Privacy reimplementation
Ian Walls [Sun, 30 Jan 2011 05:48:36 +0000 (00:48 -0500)]
Bug 3881: OPAC Privacy reimplementation

Reimplements Paul Poulain's original OPAC Privacy patch, with some minor improvements and changes to wording

If the library enables the OPACPrivacy system preference along with the opacreadinghistory preference, and sets
an AnonymousPatron (must be a valid patron number in the database), the user will see a new tab upon login to
the OPAC, My Privacy.  From there, the user can:

- Set their OPAC Privacy to one of three values
  0 - Forever.  This keeps their reading history unless they explicitly delete it; the bulk anonymiser won't touch it
  1 - Default.  Keep reading history until either they delete it or the library does
  2 - Never.    Instantly anonymises reading history upon item return

- Instantly delete their reading history
  There is a warning and a popup to confirm.  I've removed Paul's extra confirm checkbox, which seemed redundant

A note of which preference the patron has selected is added to the Patorn Details page in the staff client.  This is read-only.

This patch also consolidates Privacy system preferences into the Privacy section of the OPAC tab.

Thank you to BibLibre for the original implmentation of this patch, and Los Gatos Public Library for funding and
testing the reimplementation.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5452 - Overdue date color in borrower's today issues
Chris Cormack [Sat, 29 Jan 2011 18:58:48 +0000 (07:58 +1300)]
Bug 5452 - Overdue date color in borrower's today issues

Patch sent by Fridolyn SOMERS, but not in git format

9 years agoBUG 5649: Change wording on review.tmpl from white\black to approve\rejected consiste...
Schuster [Tue, 25 Jan 2011 09:03:49 +0000 (04:03 -0500)]
BUG 5649: Change wording on review.tmpl from white\black to approve\rejected consistent with the rest of the page

Changes the wording on review.tmpl from white\black to approve\rejected consistent with the rest of the page

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5477 [SIGN-OFF] Fix test cases that require database access
Robin Sheat [Fri, 28 Jan 2011 19:04:08 +0000 (14:04 -0500)]
Bug 5477 [SIGN-OFF] Fix test cases that require database access

This moves the DB-requiring tests out of the way, with the exception of
00-load.t which is used by the git hooks. For it, it makes it skip
loading problematic modules. This allows 'make test' to complete successfully
without a database configured, wich is a required part of making packages.

This has been tested against the v3.02.03 tag and the master branch.

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
9 years agoBug 5376: Batch Mod and Delete require superlibrarian permissions
Ian Walls [Tue, 25 Jan 2011 04:09:39 +0000 (23:09 -0500)]
Bug 5376: Batch Mod and Delete require superlibrarian permissions

This only occurs with IndependantBranches turned on; in an attempt to check that the items being
modified belonged to the user's branch, the code made a simultaneous comparison and assignment,
which is not permitted in all compilations of Perl.

Splitting the assignment of $itembranchcode and the check for its non-null value fixes the problem

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>