From gitmaster at git.koha-community.org  Mon Oct  3 21:55:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 03 Oct 2011 19:55:29 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5263
	updated. v3.04.00-265-g37c48cc
Message-ID: <E1RAobp-0006dF-L7@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_5263 has been updated
       via  37c48ccfb2b0893366676741a506e0243db49d40 (commit)
      from  57155db21305264404f5afd2788233103d038cb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37c48ccfb2b0893366676741a506e0243db49d40
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Oct 3 10:45:59 2011 -0400

    Bug 5236 Followup: items table information being keyed by biblionumber instead!
    
    This patch fixes an error with bugfix 5236; any item-table information in the PREDUE letter
    was being parsed with biblionumber as the key, instead of itemnumber.  Unless itemnumber == biblionumber,
    this will ALWAYS return the wrong information.
    
    I've moved the item table parsing line to within the if ($itemnumber) conditional check, and replaced
    the key to use the itemnumber instead of the biblionumber.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/advance_notices.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct  3 21:57:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 03 Oct 2011 19:57:07 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-628-g481f620
Message-ID: <E1RAodP-0006ew-Aa@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  481f620455d40f93a3cb37136ef2c3964497751e (commit)
       via  37c48ccfb2b0893366676741a506e0243db49d40 (commit)
      from  a291cc52ca79ed11e0032e73b380b17f3bf308cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 481f620455d40f93a3cb37136ef2c3964497751e
Merge: a291cc5 37c48cc
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 4 08:56:56 2011 +1300

    Merge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/advance_notices.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct  3 22:21:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 03 Oct 2011 20:21:40 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6937
	created. v3.04.00-629-g1d89ab2
Message-ID: <E1RAp1A-0006lQ-9c@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6937 has been created
        at  1d89ab22c973311939c3664ebb886ede713c0df2 (commit)

- Log -----------------------------------------------------------------
commit 1d89ab22c973311939c3664ebb886ede713c0df2
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 29 16:13:53 2011 +1300

    Bug 6937 - change "Fines" to "Fees & Charges" on circ page
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct  3 22:22:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 03 Oct 2011 20:22:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-629-g1d89ab2
Message-ID: <E1RAp1V-0006mE-Rl@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1d89ab22c973311939c3664ebb886ede713c0df2 (commit)
      from  481f620455d40f93a3cb37136ef2c3964497751e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct  4 23:03:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 04 Oct 2011 21:03:48 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6867
	created. v3.04.00-630-gb1e6aad
Message-ID: <E1RBC9U-00030A-73@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6867 has been created
        at  b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8 (commit)

- Log -----------------------------------------------------------------
commit b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Tue Oct 4 07:37:33 2011 -0700

    Bug 6867: Date last seen ignored on import
    
    The date last seen field (952 $r) and replacement price date (952 $w) were being
    ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
    allow a value to be imported, but if none is, it will use the ISO date of import
    as a default.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct  4 23:06:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 04 Oct 2011 21:06:34 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-630-gb1e6aad
Message-ID: <E1RBCC9-00030w-Vx@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8 (commit)
      from  1d89ab22c973311939c3664ebb886ede713c0df2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Items.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 03:40:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 01:40:13 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6975
	created. v3.04.00-631-g38f4c52
Message-ID: <E1RBcwX-00007y-IJ@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6975 has been created
        at  38f4c5264dee725505e34f81756e68d2558c59f2 (commit)

- Log -----------------------------------------------------------------
commit 38f4c5264dee725505e34f81756e68d2558c59f2
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Oct 5 14:20:43 2011 -0400

    Bug 6975: OPACBaseurl instead of OPACBaseURL
    
    Updates OPAC templates to refer to OPACBaseURL (the properly capitalized name) instead
    of OPACBaseurl
    
    Also fixes some T:T scope errors when OPACBaseURL was called within a loop
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 03:42:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 01:42:34 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-631-g38f4c52
Message-ID: <E1RBcyo-00008l-EH@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  38f4c5264dee725505e34f81756e68d2558c59f2 (commit)
      from  b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/basket/sendbasket.tt           |    2 +-
 .../prog/en/modules/virtualshelves/sendshelf.tt    |    2 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    4 +-
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |   36 ++++++++++----------
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-sendbasket.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |    2 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    8 ++--
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    2 +-
 10 files changed, 31 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 22:23:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 20:23:54 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6770
	created. v3.04.00-632-gd388acd
Message-ID: <E1RBuTy-0002hq-ID@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6770 has been created
        at  d388acd4825c7befb98438315a6ff8acd21cbbd9 (commit)

- Log -----------------------------------------------------------------
commit d388acd4825c7befb98438315a6ff8acd21cbbd9
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Tue Sep 6 16:07:49 2011 +1200

    bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 22:34:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 20:34:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-632-gd388acd
Message-ID: <E1RBudu-0002jy-Kg@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d388acd4825c7befb98438315a6ff8acd21cbbd9 (commit)
      from  38f4c5264dee725505e34f81756e68d2558c59f2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 reserve/request.pl |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 22:45:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 20:45:43 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6958
	created. v3.04.00-633-g873091d
Message-ID: <E1RBup5-0002mq-Ld@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6958 has been created
        at  873091dcc84de8856a1da936ab0045351273cc53 (commit)

- Log -----------------------------------------------------------------
commit 873091dcc84de8856a1da936ab0045351273cc53
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 4 10:43:45 2011 +1300

    Bug 6958 : Fix for leading spaces being stripped on translation
    
    This will re-add any leading spaces, so formatting is not messed
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    - all examples from the bug report are fixed now
    - verified system preferences are still translated
    - verified xslt displays are still translated
    - verified javascript alerts are still translated
    - verified switching languages works
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 22:47:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 20:47:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-633-g873091d
Message-ID: <E1RBur5-0002ns-4d@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  873091dcc84de8856a1da936ab0045351273cc53 (commit)
      from  d388acd4825c7befb98438315a6ff8acd21cbbd9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/translator/tmpl_process3.pl |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 23:00:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 21:00:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6974
	created. v3.04.00-634-g4c1ea37
Message-ID: <E1RBv3S-0002r1-7I@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6974 has been created
        at  4c1ea37e6366fc7a17ece602f73de4d7ebfbd279 (commit)

- Log -----------------------------------------------------------------
commit 4c1ea37e6366fc7a17ece602f73de4d7ebfbd279
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Oct 6 13:55:47 2011 +1300

    bug_6974: bugfix: do not create empty record before building input for new biblio
    
    It messes up javascript default values
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 23:01:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 21:01:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-634-g4c1ea37
Message-ID: <E1RBv4F-0002sb-Si@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  4c1ea37e6366fc7a17ece602f73de4d7ebfbd279 (commit)
      from  873091dcc84de8856a1da936ab0045351273cc53 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 cataloguing/addbiblio.pl |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 23:12:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 21:12:15 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6074
	created. v3.04.00-635-gb5a3f48
Message-ID: <E1RBvEl-0002uc-Q7@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6074 has been created
        at  b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863 (commit)

- Log -----------------------------------------------------------------
commit b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Apr 5 22:11:15 2011 +0200

    BZ6074: setting import flag when staged file imported in aqbasket
    
    Lines issued from a staged file have a flag that can be set when the order has
    been added in a basket. It's set when a staged file is imported into the
    catalogue, it should be set also when a record is inserted through aquisition.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Add order from staged file to a new basket
    - Add single order from one item
    - Import rest using the bulk feature
    - Staged file will no longer be shown after all titles
      have been ordered and import_status in import_batches
      is correctly  set to 'imported'
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 23:22:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 21:22:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6076
	created. v3.04.00-636-g1f0e3d7
Message-ID: <E1RBvOk-0002wn-5C@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6076 has been created
        at  1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f (commit)

- Log -----------------------------------------------------------------
commit 1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jul 8 11:13:41 2011 +0200

    Bug 6076: acqui pdf error when marcxml wrong
    
    when marcxml is wrong the PDF is not generated. There is a Perl error
    because
    the biblio can't be retrieved.
    This can be workarounded with a eval when decoding the marc
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct  6 23:28:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 21:28:15 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-636-g1f0e3d7
Message-ID: <E1RBvUE-0002yC-Ut@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f (commit)
       via  b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863 (commit)
      from  4c1ea37e6366fc7a17ece602f73de4d7ebfbd279 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 acqui/addorderiso2709.pl |   28 +++++++++++++++++++---------
 acqui/basketgroup.pl     |   11 +++++++----
 2 files changed, 26 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 00:03:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 22:03:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6268
	created. v3.04.00-638-g1e16c7c
Message-ID: <E1RBw1w-00036j-2e@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6268 has been created
        at  1e16c7cbabf1b53be061d661dc02b27d4f271a3c (commit)

- Log -----------------------------------------------------------------
commit 1e16c7cbabf1b53be061d661dc02b27d4f271a3c
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Jun 29 21:10:34 2011 +0200

    BZ6268 follow-up for the form
    
    This follow up fixes cait request to calculate the form like the budget
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0d0b3ef9c2840633ae9860b66babeba3cb453b1b
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon May 23 11:27:07 2011 +0200

    Bug 6268: (MT #6408) Bad Total in basket.pl
    
    The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
    But in the budget this amount is the summ of discounts computed for each line.
    Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 00:03:33 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 22:03:33 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-638-g1e16c7c
Message-ID: <E1RBw2P-00037u-Bw@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1e16c7cbabf1b53be061d661dc02b27d4f271a3c (commit)
       via  0d0b3ef9c2840633ae9860b66babeba3cb453b1b (commit)
      from  1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 acqui/basket.pl                           |   38 +++++++++++++++++++----------
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js |    2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 00:37:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 22:37:16 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6600
	created. v3.04.00-639-g6ade95d
Message-ID: <E1RBwZ2-0003GK-Eu@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6600 has been created
        at  6ade95d5db2f2b6a0a2d47d53aecae26a9997243 (commit)

- Log -----------------------------------------------------------------
commit 6ade95d5db2f2b6a0a2d47d53aecae26a9997243
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 19 09:12:30 2011 -0400

    Fix for Bug 6600, Library name linking wrong if current location is different
    
    GetItemsInfo in Items.pm includes this join:
    
    LEFT JOIN branches ON items.homebranch = branches.branchcode
    
    This means that the branch URL (from the branches table) comes out
    as the URL for items.homebranch, thus the URL in the holdings
    output is the item's home branch even though the display might
    be showing a different current location.
    
    This patch changes the join to use items.holdingbranch. The join
    was originally added to fix Bug 3702, and based on the description
    of that feature I'm assuming this change is not harmful to other
    usages. However, it does make the assumption that the item's
    current (holding) branch is the branch we want to see information
    about.
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 00:39:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 22:39:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-639-g6ade95d
Message-ID: <E1RBwbD-0003Hf-CP@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  6ade95d5db2f2b6a0a2d47d53aecae26a9997243 (commit)
      from  1e16c7cbabf1b53be061d661dc02b27d4f271a3c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Items.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 01:06:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 23:06:27 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6953
	created. v3.04.00-640-gc7b77c7
Message-ID: <E1RBx1H-0003NX-09@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6953 has been created
        at  c7b77c789ee17515931e9d54a23d85234ed9e505 (commit)

- Log -----------------------------------------------------------------
commit c7b77c789ee17515931e9d54a23d85234ed9e505
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sat Oct 1 17:43:55 2011 +0200

    Bug 6953 - Value builder for NORMARC 007 does not show further options
    
    A previous commit introduced a missing TT control structure, but
    forgot to include the trailing "\" for multiline JavaScript.
    This patch simply adds the missing "\".
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 01:07:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 06 Oct 2011 23:07:41 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-640-gc7b77c7
Message-ID: <E1RBx2T-0003OK-JK@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  c7b77c789ee17515931e9d54a23d85234ed9e505 (commit)
      from  6ade95d5db2f2b6a0a2d47d53aecae26a9997243 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../cataloguing/value_builder/normarc_field_007.tt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 02:46:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 00:46:20 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6584
	created. v3.04.00-641-gf02796d
Message-ID: <E1RByZw-0004EA-8p@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6584 has been created
        at  f02796d989a377266a844e5b498945372a2a254f (commit)

- Log -----------------------------------------------------------------
commit f02796d989a377266a844e5b498945372a2a254f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jul 13 15:05:16 2011 +0200

    6584: Enable searching on Zebra's Bib-level index
    
    Bib-level is already indexed in MARC21 record.abs.
    But you cannot search this index, because it is commented in ccl.properties and
    not listed in getIndexes of Search.pm.
    This very simple patch does only do those two things.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 02:50:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 00:50:46 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-641-gf02796d
Message-ID: <E1RByeE-0004Fx-Pd@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f02796d989a377266a844e5b498945372a2a254f (commit)
      from  c7b77c789ee17515931e9d54a23d85234ed9e505 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Search.pm               |    1 +
 etc/zebradb/ccl.properties |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:02:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:02:51 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6769
	created. v3.04.00-642-g293a9ba
Message-ID: <E1RBypv-0004JD-8m@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6769 has been created
        at  293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d (commit)

- Log -----------------------------------------------------------------
commit 293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 24 16:12:52 2011 +0200

    6769 Getting rid of some RIS errors/warnings
    
    Removing unnecessary warnings. Some were based on errors in the script. Others are removed by adding debug flag and disabling debugging mode by default.
    Adding carriage returns for Windows users, assuming that it does not hurt the Linux users. (Perhaps a future option?)
    Test it with: http://yourserver.com/cgi-bin/koha/opac-export.pl?bib=yourbibnumber&format=ris&op=export [replace server and biblionumber]
    
    Revision of Aug 24: Fixed two missing newlines too.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
      (removed comment "240811 marcelr during QA"
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:05:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:05:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-642-g293a9ba
Message-ID: <E1RBys2-0004K0-OB@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d (commit)
      from  f02796d989a377266a844e5b498945372a2a254f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Ris.pm |  160 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 79 insertions(+), 81 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:09:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:09:02 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6786
	created. v3.04.00-643-gcd1fbb7
Message-ID: <E1RByvu-0004Ky-ON@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6786 has been created
        at  cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1 (commit)

- Log -----------------------------------------------------------------
commit cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 25 13:12:38 2011 +0200

    6786: False detection of index names in Search; make index names case insensitive
    
    Fixing the regex to detect index names in ccl queries.  Changing loop
    structure: looping through the index candidates in the query is faster than
    testing every index name with a regex.  Making the index comparison case
    insensitive will benefit users misspelling the case of an index; Zebra does not
    care about it.  Test the change by searching on a word followed by a : or =
    character.  Previously, when that word contained an index name like an or nb,
    the search would crash.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Perltidied the new block to fix indentation
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:10:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:10:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-643-gcd1fbb7
Message-ID: <E1RByxi-0004MI-05@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1 (commit)
      from  293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Search.pm |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:21:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:21:24 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6048
	created. v3.04.00-644-gcfe8b6b
Message-ID: <E1RBz7s-0004OY-Pb@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6048 has been created
        at  cfe8b6bd9a4f1921cb728d784083300344bcf2b1 (commit)

- Log -----------------------------------------------------------------
commit cfe8b6bd9a4f1921cb728d784083300344bcf2b1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 7 17:08:48 2011 +0200

    Bug 6048: printoverdues.sh bash odities
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    
    Note: this script really needs a rewrite, but this patch does fix up the
    things it's supposed to fix up.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct  7 03:21:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 07 Oct 2011 01:21:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-644-gcfe8b6b
Message-ID: <E1RBz8I-0004PK-Iy@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  cfe8b6bd9a4f1921cb728d784083300344bcf2b1 (commit)
      from  cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/printoverdues.sh |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 08:53:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 06:53:24 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_4223
	created. v3.04.00-645-g77d69d1
Message-ID: <E1RCQmi-0001Io-5i@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_4223 has been created
        at  77d69d1bebbe1b20fd35b39e4be1afda2a899b8a (commit)

- Log -----------------------------------------------------------------
commit 77d69d1bebbe1b20fd35b39e4be1afda2a899b8a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Sep 28 09:58:04 2011 -0400

    Fix for Bug 4223 - Too much serials info - design work needed
    
    This patch reimplements the changes suggested in the original
    patch. It puts each main section of the display into its own
    tab.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 08:53:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 06:53:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-645-g77d69d1
Message-ID: <E1RCQnC-0001JZ-Pq@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  77d69d1bebbe1b20fd35b39e4be1afda2a899b8a (commit)
      from  cfe8b6bd9a4f1921cb728d784083300344bcf2b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/serials/subscription-detail.tt |  152 +++++++++++---------
 1 files changed, 84 insertions(+), 68 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 08:58:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 06:58:50 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6959
	created. v3.04.00-646-gf56dc79
Message-ID: <E1RCQrx-0001KO-Vg@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6959 has been created
        at  f56dc797546fd9f3037e974ab6f40cb603b33e74 (commit)

- Log -----------------------------------------------------------------
commit f56dc797546fd9f3037e974ab6f40cb603b33e74
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 4 13:24:05 2011 -0400

    Bug 6959: can't import record via Z39.50 from MARC edit page
    
    JS to call Z39.50 popup wasn't updated to reflect the change ID values, so the frameworkcode passed was
    "undefined" instead of "Default"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 08:59:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 06:59:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-646-gf56dc79
Message-ID: <E1RCQsR-0001LA-9v@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f56dc797546fd9f3037e974ab6f40cb603b33e74 (commit)
      from  77d69d1bebbe1b20fd35b39e4be1afda2a899b8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/cataloguing/addbiblio.tt       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 09:01:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 07:01:30 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6966
	created. v3.04.00-667-g433d70d
Message-ID: <E1RCQuY-0001Mf-Av@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6966 has been created
        at  433d70d3ebb10f2ef1eda2e3a208c0abb9596e0e (commit)

- Log -----------------------------------------------------------------
commit 433d70d3ebb10f2ef1eda2e3a208c0abb9596e0e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 15:36:05 2011 -0400

    Bug 6966 Lists help file
    
    This updates the lists help file.

commit 84a13ac022e5e49430b0533b5bcc5e8b6b25e0da
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 15:30:37 2011 -0400

    Bug 6966 Update tools help files
    
    This updates the tools help files.

commit 4ab2ab51f5394c4dcc61da89bd77c03a8b557631
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 14:14:48 2011 -0400

    Bug 6966 Tag help file
    
    This patch updates the tag moderation help file.

commit a22ae10491cb6b8ef72abf3544bd5b5f7b1ddcaf
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 14:11:41 2011 -0400

    Bug 6966 Suggestion Help Files
    
    This patch updates the suggestion help file.

commit 4b29162ddf044707e6f9b42e3de0c259d911cef8
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 14:04:43 2011 -0400

    Bug 6966 add missing routing lists help
    
    This patch adds the missing routing list help file to
    the serials folder.

commit 4cc50cc3b4e594b04764650e44edf4bd2e5fab04
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 14:01:03 2011 -0400

    Bug 6966 Update Serials Help
    
    This patch updates the serials help files.

commit 549ca98de98741e9fbfa8f5ecf51ba7d41b997c4
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 13:34:42 2011 -0400

    Bug 6966 Comments Help
    
    Updates the help file in the reviews folder.

commit be0e2efc1099a6bb876a6acddf9406f6702ea3cc
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 13:31:32 2011 -0400

    Bug 6966 Holds Help
    
    Update file in the reserve folder.

commit c44892d3180c52eb38f441088cd1cf7e84798846
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 13:13:53 2011 -0400

    Bug 6966 Reports Help
    
    This patch updates all the help files in the reports
    folder and adds links to the manual pages.

commit 6780d5d03d8eaa456ca7d4649622327f7a739761
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 7 11:50:07 2011 -0400

    Bug 6966 Patron Card Help Files
    
    This patch adds links to the manual to files in the
    patroncards folder.

commit f5121f851af64430d390520cbb4c931186933063
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 15:15:21 2011 -0400

    Bug 6966: Offline Circ Help
    
    This patch adds the manual link to the offline circ help.

commit 4f9faf4509eb4d98ca5931dc640fd0ad1b843eb6
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 14:43:26 2011 -0400

    Bug 6966: Members Help Files
    
    This patch updates the members help files. It removes
    an unused file and adds a new one for the partial fines
    payments. It also adds links to the manuals to all pages.

commit b143ed1054f0b429cf832c4797c3af108cdd41d7
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 12:03:21 2011 -0400

    Bug 6966 update help files for labels
    
    This patch adds the manual links to the label maker
    help files.

commit f33518e61e4f28be8d8f1a066ac49123352637a9
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 11:57:56 2011 -0400

    bug 6966 update help files
    
    This patch updates help files not in a module specific folder.

commit 86d9496c269a95ec1a478c15b401da28db54fc10
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 11:53:02 2011 -0400

    Bug 6966: Export help files
    
    This adds the manual link to the export help file.

commit ab55e630a87c3d291f638f0522c418b1f0507dbc
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Thu Oct 6 11:29:17 2011 -0400

    Bug 6966: Circulation Help Files
    
    This patch updates the help files in the circ folder.
    It also adds links to manual pages where needed.

commit 0f6e7d5eb4cbe1f509aa8b719a4f583fce5bb8db
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Oct 2 20:02:51 2011 -0400

    Bug 6966 Cataloging Help Files
    
    This patch updates the help files in the cataloging folder.
    It adds one missing help file and adds links to the manual
    and updates to the others.

commit d97ae8830ee7ee5ab42a8052b7c3c5b4f22d840d
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Oct 2 19:25:34 2011 -0400

    Bug 6966 Authorities Help Files
    
    This patch updates help files in the authorities folder. It
    adds links to the manual for all files that weren't edit in
    patches for bug 6942.

commit 70b17c022ed0c6fbdea63e2f2b2f7f2caf0645c7
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Oct 2 19:23:28 2011 -0400

    Bug 6966 Catalogue Help Files
    
    This patch updates the help files in the catalogue folder
    by including the link to the manual.

commit 4e65e26baba26bc154dbd41e202cff8f101b9e8c
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Oct 2 08:24:56 2011 -0400

    Bug 6966 Acquisitions help files
    
    This patch updates help files in the acqui folder. It removes
    a file that isn't used anymore and adds links to the manual
    for all files that weren't edit in patches for bug 6942.

commit 72f98b94d6aa253a0edfcf87a9968e0ebea39ffa
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Sun Oct 2 05:38:12 2011 -0400

    Bug 6966: Admin Help Files
    
    This patch updates help files in the admin folder. It removes
    two files that aren't used anymore and adds links to the manual
    for all files that weren't edit in patches for bug 6942.

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 09:02:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 07:02:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-667-g433d70d
Message-ID: <E1RCQv3-0001NR-Fs@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  433d70d3ebb10f2ef1eda2e3a208c0abb9596e0e (commit)
       via  84a13ac022e5e49430b0533b5bcc5e8b6b25e0da (commit)
       via  4ab2ab51f5394c4dcc61da89bd77c03a8b557631 (commit)
       via  a22ae10491cb6b8ef72abf3544bd5b5f7b1ddcaf (commit)
       via  4b29162ddf044707e6f9b42e3de0c259d911cef8 (commit)
       via  4cc50cc3b4e594b04764650e44edf4bd2e5fab04 (commit)
       via  549ca98de98741e9fbfa8f5ecf51ba7d41b997c4 (commit)
       via  be0e2efc1099a6bb876a6acddf9406f6702ea3cc (commit)
       via  c44892d3180c52eb38f441088cd1cf7e84798846 (commit)
       via  6780d5d03d8eaa456ca7d4649622327f7a739761 (commit)
       via  f5121f851af64430d390520cbb4c931186933063 (commit)
       via  4f9faf4509eb4d98ca5931dc640fd0ad1b843eb6 (commit)
       via  b143ed1054f0b429cf832c4797c3af108cdd41d7 (commit)
       via  f33518e61e4f28be8d8f1a066ac49123352637a9 (commit)
       via  86d9496c269a95ec1a478c15b401da28db54fc10 (commit)
       via  ab55e630a87c3d291f638f0522c418b1f0507dbc (commit)
       via  0f6e7d5eb4cbe1f509aa8b719a4f583fce5bb8db (commit)
       via  d97ae8830ee7ee5ab42a8052b7c3c5b4f22d840d (commit)
       via  70b17c022ed0c6fbdea63e2f2b2f7f2caf0645c7 (commit)
       via  4e65e26baba26bc154dbd41e202cff8f101b9e8c (commit)
       via  72f98b94d6aa253a0edfcf87a9968e0ebea39ffa (commit)
      from  f56dc797546fd9f3037e974ab6f40cb603b33e74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/help/about.tt    |    2 +
 .../prog/en/modules/help/acqui/acqcontract.tt      |    2 +
 .../prog/en/modules/help/acqui/basket.tt           |    2 +
 .../prog/en/modules/help/acqui/basketgroup.tt      |    2 +
 .../prog/en/modules/help/acqui/basketheader.tt     |    2 +
 .../prog/en/modules/help/acqui/booksellers.tt      |   12 ++-
 .../prog/en/modules/help/acqui/histsearch.tt       |   14 ++-
 .../prog/en/modules/help/acqui/lateorders.tt       |    2 +
 .../prog/en/modules/help/acqui/newbiblio.tt        |    5 -
 .../prog/en/modules/help/acqui/neworderbiblio.tt   |    2 +
 .../prog/en/modules/help/acqui/neworderempty.tt    |    2 +
 .../en/modules/help/acqui/newordersuggestion.tt    |    2 +
 .../prog/en/modules/help/acqui/orderreceive.tt     |    2 +
 .../prog/en/modules/help/acqui/parcel.tt           |    4 +-
 .../prog/en/modules/help/acqui/parcels.tt          |    2 +
 .../prog/en/modules/help/acqui/supplier.tt         |    4 +-
 .../prog/en/modules/help/acqui/z3950_search.tt     |    2 +
 .../prog/en/modules/help/admin/aqbookfund.tt       |   41 -----
 .../prog/en/modules/help/admin/aqbudget.tt         |   33 ----
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |    2 +
 .../prog/en/modules/help/admin/aqbudgets.tt        |    4 +-
 .../prog/en/modules/help/admin/aqplan.tt           |    2 +
 .../modules/help/admin/auth_subfields_structure.tt |    1 +
 .../en/modules/help/admin/auth_tag_structure.tt    |    2 +
 .../en/modules/help/admin/authorised_values.tt     |    2 +
 .../prog/en/modules/help/admin/authtypes.tt        |    2 +
 .../prog/en/modules/help/admin/biblio_framework.tt |    2 +
 .../modules/help/admin/branch_transfer_limits.tt   |    2 +
 .../prog/en/modules/help/admin/branches.tt         |    4 +-
 .../prog/en/modules/help/admin/categorie.tt        |    2 +
 .../prog/en/modules/help/admin/checkmarc.tt        |    2 +
 .../prog/en/modules/help/admin/cities.tt           |    2 +
 .../prog/en/modules/help/admin/classsources.tt     |    2 +
 .../prog/en/modules/help/admin/currency.tt         |    2 +
 .../prog/en/modules/help/admin/fieldmapping.tt     |    2 +
 .../modules/help/admin/item_circulation_alerts.tt  |    2 +
 .../prog/en/modules/help/admin/itemtypes.tt        |    2 +
 .../prog/en/modules/help/admin/koha2marclinks.tt   |    2 +
 .../modules/help/admin/marc_subfields_structure.tt |    2 +
 .../prog/en/modules/help/admin/marctagstructure.tt |    2 +
 .../prog/en/modules/help/admin/matching-rules.tt   |    2 +
 .../en/modules/help/admin/patron-attr-types.tt     |    2 +
 .../prog/en/modules/help/admin/preferences.tt      |    2 +
 .../prog/en/modules/help/admin/roadtype.tt         |    2 +
 .../prog/en/modules/help/admin/smart-rules.tt      |   24 +--
 .../prog/en/modules/help/admin/stopwords.tt        |    2 +
 .../prog/en/modules/help/admin/z3950servers.tt     |    2 +
 .../en/modules/help/authorities/authorities.tt     |    2 +
 .../prog/en/modules/help/authorities/detail.tt     |    2 +
 .../prog/en/modules/help/catalogue/issuehistory.tt |    2 +
 .../prog/en/modules/help/catalogue/moredetail.tt   |    2 +
 .../prog/en/modules/help/catalogue/search.tt       |    2 +
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |   39 +++--
 .../prog/en/modules/help/cataloguing/additem.tt    |   16 +-
 .../prog/en/modules/help/cataloguing/merge.tt      |    8 +-
 .../prog/en/modules/help/cataloguing/moveitem.tt   |   15 ++
 .../prog/en/modules/help/circ/branchoverdues.tt    |    5 +-
 .../prog/en/modules/help/circ/branchtransfers.tt   |    4 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |   26 ++--
 .../prog/en/modules/help/circ/circulation.tt       |   24 ++-
 .../prog/en/modules/help/circ/overdue.tt           |    2 +
 .../prog/en/modules/help/circ/pendingreserves.tt   |    2 +
 .../prog/en/modules/help/circ/reserveratios.tt     |    2 +
 .../prog/en/modules/help/circ/returns.tt           |   12 +-
 .../en/modules/help/circ/selectbranchprinter.tt    |   38 +---
 .../en/modules/help/circ/transferstoreceive.tt     |    2 +
 .../prog/en/modules/help/circ/view_holdsqueue.tt   |    2 +
 .../prog/en/modules/help/circ/waitingreserves.tt   |    4 +
 .../prog/en/modules/help/export/marc.tt            |    2 +
 .../en/modules/help/labels/label-edit-batch.tt     |    2 +
 .../en/modules/help/labels/label-edit-layout.tt    |    2 +
 .../en/modules/help/labels/label-edit-profile.tt   |    2 +-
 .../en/modules/help/labels/label-edit-template.tt  |    2 +
 .../prog/en/modules/help/labels/label-home.tt      |    2 +
 .../prog/en/modules/help/labels/spinelabel-home.tt |    2 +
 .../prog/en/modules/help/members/boraccount.tt     |    6 +-
 .../prog/en/modules/help/members/mancredit.tt      |    3 +
 .../prog/en/modules/help/members/maninvoice.tt     |    3 +
 .../prog/en/modules/help/members/member-flags.tt   |   67 +++++---
 .../en/modules/help/members/member-password.tt     |    9 +-
 .../prog/en/modules/help/members/member.tt         |    2 +
 .../prog/en/modules/help/members/memberentry.tt    |    2 +
 .../prog/en/modules/help/members/members-home.tt   |   21 +--
 .../prog/en/modules/help/members/messaging.tt      |    9 -
 .../prog/en/modules/help/members/moremember.tt     |   16 +-
 .../prog/en/modules/help/members/notices.tt        |    6 +-
 .../prog/en/modules/help/members/pay.tt            |    2 +
 .../modules/help/members/{pay.tt => paycollect.tt} |    2 +
 .../prog/en/modules/help/members/readingrec.tt     |    4 +-
 .../intranet-tmpl/prog/en/modules/help/nohelp.tt   |   12 +-
 .../en/modules/help/offline_circ/process_koc.tt    |    2 +
 .../prog/en/modules/help/patroncards/edit-batch.tt |    2 +
 .../en/modules/help/patroncards/edit-layout.tt     |    2 +
 .../en/modules/help/patroncards/edit-profile.tt    |    2 +
 .../en/modules/help/patroncards/edit-template.tt   |    2 +
 .../prog/en/modules/help/patroncards/home.tt       |    2 +
 .../en/modules/help/patroncards/image-manage.tt    |    2 +
 .../prog/en/modules/help/patroncards/manage.tt     |    2 +
 .../en/modules/help/reports/acquisitions_stats.tt  |   22 ++-
 .../prog/en/modules/help/reports/bor_issues_top.tt |   23 +--
 .../prog/en/modules/help/reports/borrowers_out.tt  |   20 ++-
 .../en/modules/help/reports/borrowers_stats.tt     |   30 +---
 .../prog/en/modules/help/reports/cat_issues_top.tt |   22 +--
 .../prog/en/modules/help/reports/catalogue_out.tt  |   24 ++--
 .../en/modules/help/reports/catalogue_stats.tt     |   27 +--
 .../prog/en/modules/help/reports/dictionary.tt     |   61 +------
 .../prog/en/modules/help/reports/guided_reports.tt |   30 ++-
 .../en/modules/help/reports/issues_avg_stats.tt    |   17 +-
 .../prog/en/modules/help/reports/issues_stats.tt   |   43 +++---
 .../prog/en/modules/help/reports/itemslost.tt      |    6 +-
 .../prog/en/modules/help/reports/manager.tt        |   17 +-
 .../prog/en/modules/help/reports/reports-home.tt   |   26 ++-
 .../prog/en/modules/help/reports/serials_stats.tt  |   22 +--
 .../prog/en/modules/help/reserve/request.tt        |  106 ++++++++----
 .../prog/en/modules/help/reviews/reviewswaiting.tt |   27 +---
 .../en/modules/help/serials/checkexpiration.tt     |   24 +--
 .../prog/en/modules/help/serials/claims.tt         |   27 ++--
 .../prog/en/modules/help/serials/routing.tt        |   21 +++
 .../en/modules/help/serials/serials-collection.tt  |    2 +
 .../prog/en/modules/help/serials/serials-edit.tt   |   18 ++-
 .../prog/en/modules/help/serials/serials-home.tt   |    4 +-
 .../en/modules/help/serials/subscription-add.tt    |  187 ++++++++------------
 .../en/modules/help/serials/subscription-detail.tt |    2 +
 .../prog/en/modules/help/suggestion/suggestion.tt  |   10 +
 .../prog/en/modules/help/tags/review.tt            |   12 +-
 .../prog/en/modules/help/tools/batchMod.tt         |   10 +-
 .../prog/en/modules/help/tools/cleanborrowers.tt   |   28 ++--
 .../prog/en/modules/help/tools/csv-profiles.tt     |   45 ++++-
 .../prog/en/modules/help/tools/export.tt           |   42 +++--
 .../prog/en/modules/help/tools/holidays.tt         |   95 +++++------
 .../prog/en/modules/help/tools/import_borrowers.tt |   83 ++++++---
 .../prog/en/modules/help/tools/inventory.tt        |    3 +
 .../prog/en/modules/help/tools/koha-news.tt        |   33 +++--
 .../prog/en/modules/help/tools/letter.tt           |   53 ++++--
 .../en/modules/help/tools/manage-marc-import.tt    |   49 ++++--
 .../prog/en/modules/help/tools/overduerules.tt     |   25 ++--
 .../prog/en/modules/help/tools/picture-upload.tt   |   68 +++-----
 .../prog/en/modules/help/tools/scheduler.tt        |   44 +++--
 .../en/modules/help/tools/stage-marc-import.tt     |   38 +++--
 .../prog/en/modules/help/tools/tools-home.tt       |   11 +-
 .../prog/en/modules/help/tools/viewlog.tt          |   27 ++--
 .../prog/en/modules/help/virtualshelves/shelves.tt |   92 +++-------
 142 files changed, 1187 insertions(+), 1012 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/messaging.tt
 copy koha-tmpl/intranet-tmpl/prog/en/modules/help/members/{pay.tt => paycollect.tt} (91%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 09:11:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 07:11:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6371
	created. v3.04.00-668-g7d599af
Message-ID: <E1RCR3n-0001QC-Tz@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6371 has been created
        at  7d599afe6d044db30f4ba7c233fce774dd8020d2 (commit)

- Log -----------------------------------------------------------------
commit 7d599afe6d044db30f4ba7c233fce774dd8020d2
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu May 19 06:54:38 2011 +0200

    Bug 6371 Item Types description not properly displayed if not pure ASCII
    
    In several places, C4::ItemType module is used to retrieve item types
    and their description. If the description text contains non-ASCII
    characters, those characters are not properly displayed.
    
    This bug can be seen in:
    
      - 4xx plugin of a UNIMARC DB
      - Home > Admin > Item circulation alerts
      - others?...
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
      - Fixes display probems in circulation alerts and 4xx UNIMARC plugin
      - display in other places looks ok with and without patch
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 09:17:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 07:17:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-668-g7d599af
Message-ID: <E1RCRAJ-0001Rw-T1@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  7d599afe6d044db30f4ba7c233fce774dd8020d2 (commit)
      from  433d70d3ebb10f2ef1eda2e3a208c0abb9596e0e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/ItemType.pm |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct  8 18:54:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 16:54:10 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-25-g3a0861c
Message-ID: <E1RCaA5-00030q-VV@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  3a0861c5da192d4f6a999f00530e0e6853d373ce (commit)
       via  459c3c7b760d8e5e27589ea5545eb0da80e65516 (commit)
       via  0155ee41e698faa6733b6658b923dfe07008b3dd (commit)
       via  fc107f0595641fa967d9c58fe58ccfcc6a940600 (commit)
       via  e57c54c332c8000d5fab786e06b51858331fd218 (commit)
       via  c48fcbc8e99c64d1022f18c6343c161db103348b (commit)
       via  8303c4dbf83039cd076513a14403553c54a47f46 (commit)
       via  0e1283413acf5de9d2844083e8e0e73b3398e939 (commit)
       via  2afee7b84a2d23f461dad1e39a6e97f25a90e3ed (commit)
       via  c3a3d3ad242b5ffa17c28430f14a3dc9ca06971a (commit)
       via  9a11fda019ffb72eaa37e807072c623a7928af3d (commit)
       via  23d97c608c8e366c7a4c13d862933d7c65209d38 (commit)
       via  397476110fe7a2801616d7394cd41c58753423b8 (commit)
       via  a8d0be4bcd4e0f355184521fba5fe2a2022fcf8c (commit)
       via  9310c45e527d122abe363e9453be2e0c69ec4c28 (commit)
       via  cb7988e5f6f7448cbcfc3e2649616a4d842a3b65 (commit)
       via  dd48e4392d1af9dcb3920d00d717ed6b2a6ebfd6 (commit)
       via  593064036e24330321e5fdf8a98598e8df58b121 (commit)
       via  3d9fe2cec143c138ac47ed6027297b904d2cd44c (commit)
       via  bdb0cf0696ab68938e980c1d932787871fa66f03 (commit)
       via  547246877e6469507071a63ab5c547bfdddb204c (commit)
       via  3ca4d242d0c6b5e881f3c33fec9c30f785c16c27 (commit)
       via  1fdebcb296788b7c95f5644fa5712ba644448b8c (commit)
       via  a8a44a593a76a7d41339c3cf73928594b4658045 (commit)
       via  89fac70d42c9557e6be7a11b235c461322dddb26 (commit)
      from  c86b79fd601395caff3a8b43700cb4b08d093315 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3a0861c5da192d4f6a999f00530e0e6853d373ce
Author: Janusz Kaczmarek <januszop at gmail.com>
Date:   Mon Jun 6 00:41:03 2011 +0300

    Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
    
    A corrected version of the patch of 6 June 2011.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 459c3c7b760d8e5e27589ea5545eb0da80e65516
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 11:55:58 2011 +1300

    Fixing a broken test
    (cherry picked from commit 7244d5060be46f0b7154b897d28997970774957d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0155ee41e698faa6733b6658b923dfe07008b3dd
Author: Meenakshi.R <meenakshi.r at osslabs.biz>
Date:   Mon Aug 29 16:36:25 2011 +0530

    Bug:6781--Log membership renewal
    
    If patron related logging is tuned on, log membership renewal
    
    Signed-off-by: Amit Gupta <amit.gupta at osslabs.biz>
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 8b75f5b38c00609299d7b6ed14bb5a08540f2675)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fc107f0595641fa967d9c58fe58ccfcc6a940600
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Sep 17 09:09:23 2011 +0200

    Bug 6649 Allow help screens editing
    
    edithelp.pl hadn't been updated to allow help screen editing.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Only a note: Apparently you need to be 'superlibrarian' permission
    to edit help pages.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f640a3ea5fdd85695ff7a75240c830369b5aed73)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e57c54c332c8000d5fab786e06b51858331fd218
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 22 15:32:24 2011 +1200

    Bug 6205 - if an include doesn't exist, fall back to en
    
    If a language that doesn't exist gets accessed, then it will fall back
    to en for the templates, but not for the includes, so everything still
    dies. This allows the process to work in this case too.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    
    I confirm the bug and the solution. This issue occurs when templates are
    partially translated. The main template (.tt) is found for a specific
    language, so this language is returned by themetemplate. But in the main
    template, some include files (subtemplates) are referenced that can very
    well not exist if the translation process had failed to generate them.
    This kind of failure is reported by 'translate' script. It's very easy
    to miss it, but it's the translator responsability to check it.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 62b76aa98c4f30ae32cb76ba0348e94d31e8464f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c48fcbc8e99c64d1022f18c6343c161db103348b
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 22 13:59:11 2011 -0500

    Bug 6871 - add schema and sql library reports to guided reports sidebar
    
    This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 9f688ab5bc84b3522002929c5f65f37581ec1749)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8303c4dbf83039cd076513a14403553c54a47f46
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Thu Sep 22 22:36:48 2011 -0400

    Bug 6773: circ/ysearch.pl is unlimited
    
    Added a LIMIT 10 to the SQL statement
    Edited the circulation.pref stating that autocomplete returns the first 10 results at a time
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 38ca8d6de18e630751dcae313d66f8546934fb5c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0e1283413acf5de9d2844083e8e0e73b3398e939
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 16 10:27:24 2011 -0400

    Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
    
    - Increases the width of the editor to fill the space provided
    - Adjusts the layout of the toolbars to better fit the space
    - Adds a custom editor stylesheet to make the contents of the
      editor better match the expected output
    
    In changing the toolbar configuration I chose to make the display
    of each button explicit rather than assuming a default set of
    buttons and adding or subtracting from that. I think this is
    clearer for someone approaching the configuration trying to under-
    stand how buttons are displayed. I also chose to use the
    shorthand "|" instead of "separator" for brevity. This last change
    is the only one made to the edithelp configuration.
    
    [2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
    fixing help pages editing, and so could be applied before or after it.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3c0883fac72368814e527325fc4e42d59f1339fc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2afee7b84a2d23f461dad1e39a6e97f25a90e3ed
Author: MJ Ray <mjr at phonecoop.coop>
Date:   Thu Sep 22 19:27:43 2011 +0100

    Bug 6460: alternative fix, updating template and script instead of C4::Log
    
    Add some test cases and fix a bug in C4::Log found by in review.
    Thanks-to: Katrin Fischer.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Passes test, interface works as expected.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a746e11c1462df4567c007c8e73cf14a55af5ddb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c3a3d3ad242b5ffa17c28430f14a3dc9ca06971a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 21 15:52:23 2011 +1200

    Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
    
    Signed-off-by: Ian <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e1bb9e5137110c636334d4039b46c68bfd615b42)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9a11fda019ffb72eaa37e807072c623a7928af3d
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Aug 31 15:22:38 2011 +1200

    Bug 6824 - correctly check basket viewing permissions
    
    Previously you couldn't view baskets that you hadn't created, unless you
    were superlibrarian due to a bug. Now people with the right permissions
    can see the baskets.
    
    Applies to both 3.04.04 and master.
    
    Signed-off-by: Brendan <info at bywatersolutions.com>
    Signed-off-by: Melia Meggs <melia at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 9966d218ae1705b272841c721bf4355437ba5a44)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 23d97c608c8e366c7a4c13d862933d7c65209d38
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Sep 23 11:33:00 2011 +1200

    Bug 6755 follow up, fixing broken POD
    (cherry picked from commit 8e7b1636086b6689e72905c5008841e585c04e8e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 397476110fe7a2801616d7394cd41c58753423b8
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Sep 22 11:05:13 2011 +0200

    Bug 6755 follow up
    
    Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
    in preferences.pl
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d60732119c95eeb27af0a79adec4fcfa6d9c966e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a8d0be4bcd4e0f355184521fba5fe2a2022fcf8c
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Aug 25 15:01:19 2011 +0200

    Bug 6755 Problems with switching languages
    
    This patch solves the situation that news is in another language than
    the Koha interface AND makes that themelanguage routine is always called
    the same way in order to prevent mixed display.
    
    It fixes also a bug related to language preselection based on web
    browser prefered language.
    
    September 9: Adjusted with input of Frederic Demians.
    
    Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
    Templates related functions are moved from C4::Output to C4::Templates
    
    Signed-off-by: Alex Arnaud <alex.arnaud at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9310c45e527d122abe363e9453be2e0c69ec4c28
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Sep 22 10:33:34 2011 +1200

    Bug 6881 - Not able to accept a suggestion (typo in template)
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Easy fix, works great.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4029e8ed755b58c7b3a25c162838c20f5a6ad149)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cb7988e5f6f7448cbcfc3e2649616a4d842a3b65
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Fri Sep 2 16:21:23 2011 +0200

    Bug 3704: SIP Checkin of not checked out item returns error without reason
    
    Checking in an available item returns an error (which is correct) without
    giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).
    
    Based on code suggested by Patrick Langer <patrick.langer at easycheck.org>
    
    Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a2ee6443b9643ad0780ad62ef63d0a06d5c674f0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit dd48e4392d1af9dcb3920d00d717ed6b2a6ebfd6
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Wed Sep 7 16:02:21 2011 +1200

    bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    To test:
    - add new fund for an active budget
    - order item, price 8.00
    - check funds page and acq home: committed amount should be 8.00
    - receive item, enter actual price 10.00
    - check funds page and acq home: spent amount should be 10.00
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4fb88deaa7a0ada50480751cbfadcf1dde75d8eb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 593064036e24330321e5fdf8a98598e8df58b121
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Wed Sep 21 08:50:19 2011 -0700

    Bug 6900 - line break between available and reference items
    
    This patch adds a conditional line-break in the availability section of XSLT results.
    
    Signed off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 65e65d7c37e052e6fa8253001f47c497e22e6fd3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3d9fe2cec143c138ac47ed6027297b904d2cd44c
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Tue Sep 13 15:50:26 2011 +1200

    Bug 6360 - add some more sounds to some happenings on returns
    
    This adds an alert sound to various events around transfers and holds
    when items are being returned, to make it more apparent that attention
    is needed.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6e91a453aa5a693c7e15c6e82f14e66471b3ec98)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bdb0cf0696ab68938e980c1d932787871fa66f03
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Mon Sep 12 21:09:49 2011 +1200

    bug_6576: Submit when changing framework rather then reloading
    
    TransformHtmlToMarc(): changed interface - no point passing params when
    they can be accessed from $cgi
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c453a45f384ce87a8af4ab9339fb877b11a79105)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 547246877e6469507071a63ab5c547bfdddb204c
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Tue Sep 20 17:40:36 2011 -0400

    Bug 6679 : fix 3 perl::critic warnings
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6200d4ae21a6e780fe221d0f873395f5d60c063c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3ca4d242d0c6b5e881f3c33fec9c30f785c16c27
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 8 20:29:05 2011 +1200

    Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
    
    Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
    patch add admin & acqui scripts to test case and fix various errors related to
    Perl::Critic compliancy.
    
    - Fixing a style error to pass Perl::Critic, plus silencing a warn
    - More style errors, plus fixing a security issue
    - Explicitly using Carp
    
    Contrary to common belief, subroutine prototypes do not enable
    compile-time checks for proper arguments. Don't use them.
    
    Defining a named sub within another sub, does not prevent that
    subroutine being global
    
    Signed-off-by: Fr?d?ric Demians <frederic at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7cdea5de355e853f25300821cc641672443177de)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 1fdebcb296788b7c95f5644fa5712ba644448b8c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 15 10:12:27 2011 -0400

    Fix for Bug 6842 - Branch transfer limits broken
    
    - Changing library select form so that chosen library is preselected
    - Changing pager <form> to a <p> so that nested form tags don't
      conflict. It was the addition of the javascript table pager
      which broke the functionality on this page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - It's possible to select a different library now. The pull down shows
    the chosen library correctly.
    - I can make changes and save them without any problems.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 377f174b0674b009945036c3ac3724378e12e9c5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a8a44a593a76a7d41339c3cf73928594b4658045
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 23 12:18:44 2011 -0400

    Fix for Bug 6766 - Template variable scope errors in holds template
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 06a939178ccbbcf1809c1b1e7bc1d12124165ff3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 89fac70d42c9557e6be7a11b235c461322dddb26
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 11:21:24 2011 +1200

    Bug 5675 : CheckReserves not honouring item level itemtypes preferences
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    With item level itypes activated only the item for which holds were
    allowed in circulation rules triggered the hold notice on checkin.
    
    Also checked that biblio level itype still trigered correctly.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1a54fc3642ff885a852d197161974233a3fcf299)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |   21 ++-
 C4/Biblio.pm                                       |   34 ++--
 C4/Budgets.pm                                      |    2 +-
 C4/Log.pm                                          |    3 +-
 C4/Members.pm                                      |    1 +
 C4/Output.pm                                       |  178 +-------------------
 C4/Reserves.pm                                     |   29 +++-
 C4/SIP/ILS.pm                                      |   16 +-
 C4/Templates.pm                                    |  182 +++++++++++++++++++-
 C4/XSLT.pm                                         |    5 +-
 about.pl                                           |    2 +-
 acqui/addorderiso2709.pl                           |   19 ++-
 acqui/basket.pl                                    |    2 +-
 acqui/basketgroup.pl                               |   36 ++++-
 acqui/booksellers.pl                               |    2 +-
 acqui/neworderempty.pl                             |    3 +-
 admin/authorised_values.pl                         |    2 +-
 admin/branch_transfer_limits.pl                    |    1 +
 admin/preferences.pl                               |   24 ++--
 authorities/authorities.pl                         |   11 +-
 authorities/detail.pl                              |    2 +-
 catalogue/moredetail.pl                            |    2 +-
 catalogue/search.pl                                |    2 +-
 cataloguing/addbiblio.pl                           |   21 ++-
 cataloguing/merge.pl                               |    3 +-
 cataloguing/value_builder/unimarc_field_100.pl     |   18 ++-
 cataloguing/value_builder/unimarc_field_105.pl     |   37 +++--
 cataloguing/value_builder/unimarc_field_110.pl     |   24 ++-
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +++--
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 ++-
 cataloguing/value_builder/unimarc_field_116.pl     |   31 ++--
 cataloguing/value_builder/unimarc_field_117.pl     |   20 ++-
 cataloguing/value_builder/unimarc_field_120.pl     |   21 ++-
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 +-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 ++-
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +++--
 cataloguing/value_builder/unimarc_leader.pl        |   19 ++-
 changelanguage.pl                                  |    4 +-
 circ/overdue.pl                                    |    2 +-
 circ/ypattrodue-attr-search-authvalue.pl           |    2 +-
 circ/ysearch.pl                                    |    5 +-
 edithelp.pl                                        |   31 ++--
 help.pl                                            |    4 +-
 installer/InstallAuth.pm                           |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css    |    4 +
 .../prog/en/includes/guided-reports-view.inc       |    5 +
 .../en/modules/admin/branch_transfer_limits.tt     |   12 +-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 .../prog/en/modules/cataloguing/addbiblio.tt       |    8 +-
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 +-
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +-
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 +++---
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 ++--
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +-
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +-
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 ++--
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   32 +++-
 .../prog/en/modules/help/circ/circulation-home.tt  |   34 ++--
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    9 +-
 .../prog/en/modules/reserve/request.tt             |    4 +-
 .../prog/en/modules/suggestion/suggestion.tt       |    2 +-
 .../prog/en/modules/tools/koha-news.tt             |   16 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   85 +---------
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    6 +
 misc/cronjobs/gather_print_notices.pl              |    6 +-
 misc/exportauth.pl                                 |    1 -
 opac/opac-changelanguage.pl                        |    4 +-
 opac/opac-main.pl                                  |   28 +---
 opac/opac-search.pl                                |    2 +-
 t/00-testcritic.t                                  |    2 +-
 t/db_dependent/Log.t                               |   55 ++++++
 tools/export.pl                                    |    2 +-
 tools/viewlog.pl                                   |    6 +-
 85 files changed, 861 insertions(+), 666 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css
 create mode 100644 t/db_dependent/Log.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 00:06:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 08 Oct 2011 22:06:38 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-49-g143479a
Message-ID: <E1RCf2U-0004WZ-Fo@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  143479ab2e3eaddcb714ea769e7d50436f6fd7fa (commit)
       via  e131d2eebc42880ae0f62b3ad293958d95b68fe5 (commit)
       via  c8651c378929ede341255ea356f6a35690efb51e (commit)
       via  977dd46d8665ba4e6a5b8c5bcbb14a1eee0d00e8 (commit)
       via  bb0ddc28d126471c4ebc2873cc733398818d2cb4 (commit)
       via  908dc3da4ad899b06a055a77986c68357ed59f7e (commit)
       via  9d83b88b56431c83192d99026354c56c85bac3c6 (commit)
       via  e91acda9fc2de47fde32b0d9f17f1884a145b98f (commit)
       via  ce53aac2a20c3dc017b10bf4c053ddd74171a6c3 (commit)
       via  a48bf80e496c9e5aa225dd5c4aacb03c9d34df2e (commit)
       via  0afdcd38dc8ca6ebd14d266d7f894c8fdabd947d (commit)
       via  6715bc36724a78d03e0b44b323a74d3d7bbf47fb (commit)
       via  41a1b6ba6ad67c53b67ee38605f678bb2aa4ad4e (commit)
       via  6773772d59d4e4a77c2e0bc7ebb0743dcd4d8946 (commit)
       via  e5f2ddb2be52425e207696a9d7ecd893d6a77cde (commit)
       via  37ef2f1830d98a75a302d2d8c1dfc294ba230619 (commit)
       via  4c774d23f9049929b97c7c416ec3196ce4628305 (commit)
       via  cac61e967c9a2b1f73aa5097430b96eec03c365a (commit)
       via  19cd06bbcfd4527a5e0ece3d8786071d7678240d (commit)
       via  05b2ca07b61fcfd56431b7d4d4378417d1c6567b (commit)
       via  62520c247a652285b1bbaaa4a0399d4cd38a9334 (commit)
       via  27de4e13e4e6c1eb0a5beacd3b48227ccb4c8799 (commit)
       via  9898e6d50ea9c29d1c3198da0766d9dfb8cfeaf8 (commit)
       via  35edcc2147a9327e5d2263ff7f91fc6ada9aa1bd (commit)
      from  3a0861c5da192d4f6a999f00530e0e6853d373ce (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 143479ab2e3eaddcb714ea769e7d50436f6fd7fa
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu May 19 06:54:38 2011 +0200

    Bug 6371 Item Types description not properly displayed if not pure ASCII
    
    In several places, C4::ItemType module is used to retrieve item types
    and their description. If the description text contains non-ASCII
    characters, those characters are not properly displayed.
    
    This bug can be seen in:
    
      - 4xx plugin of a UNIMARC DB
      - Home > Admin > Item circulation alerts
      - others?...
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
      - Fixes display probems in circulation alerts and 4xx UNIMARC plugin
      - display in other places looks ok with and without patch
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7d599afe6d044db30f4ba7c233fce774dd8020d2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e131d2eebc42880ae0f62b3ad293958d95b68fe5
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 4 13:24:05 2011 -0400

    Bug 6959: can't import record via Z39.50 from MARC edit page
    
    JS to call Z39.50 popup wasn't updated to reflect the change ID values, so the frameworkcode passed was
    "undefined" instead of "Default"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f56dc797546fd9f3037e974ab6f40cb603b33e74)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c8651c378929ede341255ea356f6a35690efb51e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Sep 28 09:58:04 2011 -0400

    Fix for Bug 4223 - Too much serials info - design work needed
    
    This patch reimplements the changes suggested in the original
    patch. It puts each main section of the display into its own
    tab.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 77d69d1bebbe1b20fd35b39e4be1afda2a899b8a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 977dd46d8665ba4e6a5b8c5bcbb14a1eee0d00e8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 7 17:08:48 2011 +0200

    Bug 6048: printoverdues.sh bash odities
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    
    Note: this script really needs a rewrite, but this patch does fix up the
    things it's supposed to fix up.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit cfe8b6bd9a4f1921cb728d784083300344bcf2b1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bb0ddc28d126471c4ebc2873cc733398818d2cb4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Aug 25 13:12:38 2011 +0200

    6786: False detection of index names in Search; make index names case insensitive
    
    Fixing the regex to detect index names in ccl queries.  Changing loop
    structure: looping through the index candidates in the query is faster than
    testing every index name with a regex.  Making the index comparison case
    insensitive will benefit users misspelling the case of an index; Zebra does not
    care about it.  Test the change by searching on a word followed by a : or =
    character.  Previously, when that word contained an index name like an or nb,
    the search would crash.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Perltidied the new block to fix indentation
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 908dc3da4ad899b06a055a77986c68357ed59f7e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Aug 24 16:12:52 2011 +0200

    6769 Getting rid of some RIS errors/warnings
    
    Removing unnecessary warnings. Some were based on errors in the script. Others are removed by adding debug flag and disabling debugging mode by default.
    Adding carriage returns for Windows users, assuming that it does not hurt the Linux users. (Perhaps a future option?)
    Test it with: http://yourserver.com/cgi-bin/koha/opac-export.pl?bib=yourbibnumber&format=ris&op=export [replace server and biblionumber]
    
    Revision of Aug 24: Fixed two missing newlines too.
    
    Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
      (removed comment "240811 marcelr during QA"
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9d83b88b56431c83192d99026354c56c85bac3c6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jul 13 15:05:16 2011 +0200

    6584: Enable searching on Zebra's Bib-level index
    
    Bib-level is already indexed in MARC21 record.abs.
    But you cannot search this index, because it is commented in ccl.properties and
    not listed in getIndexes of Search.pm.
    This very simple patch does only do those two things.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f02796d989a377266a844e5b498945372a2a254f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e91acda9fc2de47fde32b0d9f17f1884a145b98f
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Sat Oct 1 17:43:55 2011 +0200

    Bug 6953 - Value builder for NORMARC 007 does not show further options
    
    A previous commit introduced a missing TT control structure, but
    forgot to include the trailing "\" for multiline JavaScript.
    This patch simply adds the missing "\".
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c7b77c789ee17515931e9d54a23d85234ed9e505)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ce53aac2a20c3dc017b10bf4c053ddd74171a6c3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jul 19 09:12:30 2011 -0400

    Fix for Bug 6600, Library name linking wrong if current location is different
    
    GetItemsInfo in Items.pm includes this join:
    
    LEFT JOIN branches ON items.homebranch = branches.branchcode
    
    This means that the branch URL (from the branches table) comes out
    as the URL for items.homebranch, thus the URL in the holdings
    output is the item's home branch even though the display might
    be showing a different current location.
    
    This patch changes the join to use items.holdingbranch. The join
    was originally added to fix Bug 3702, and based on the description
    of that feature I'm assuming this change is not harmful to other
    usages. However, it does make the assumption that the item's
    current (holding) branch is the branch we want to see information
    about.
    
    Signed-off-by: Nicole Engard <nengard at gmail.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6ade95d5db2f2b6a0a2d47d53aecae26a9997243)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a48bf80e496c9e5aa225dd5c4aacb03c9d34df2e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Jun 29 21:10:34 2011 +0200

    BZ6268 follow-up for the form
    
    This follow up fixes cait request to calculate the form like the budget
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1e16c7cbabf1b53be061d661dc02b27d4f271a3c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0afdcd38dc8ca6ebd14d266d7f894c8fdabd947d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon May 23 11:27:07 2011 +0200

    Bug 6268: (MT #6408) Bad Total in basket.pl
    
    The total_est_gste or gsti is computed on the total_rrp_gste or gsti.
    But in the budget this amount is the summ of discounts computed for each line.
    Due to the rounding to 2 decimal places this produces a difference in Funds view with Total sublevels spent.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0d0b3ef9c2840633ae9860b66babeba3cb453b1b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6715bc36724a78d03e0b44b323a74d3d7bbf47fb
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jul 8 11:13:41 2011 +0200

    Bug 6076: acqui pdf error when marcxml wrong
    
    when marcxml is wrong the PDF is not generated. There is a Perl error
    because
    the biblio can't be retrieved.
    This can be workarounded with a eval when decoding the marc
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 41a1b6ba6ad67c53b67ee38605f678bb2aa4ad4e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Apr 5 22:11:15 2011 +0200

    BZ6074: setting import flag when staged file imported in aqbasket
    
    Lines issued from a staged file have a flag that can be set when the order has
    been added in a basket. It's set when a staged file is imported into the
    catalogue, it should be set also when a record is inserted through aquisition.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - Add order from staged file to a new basket
    - Add single order from one item
    - Import rest using the bulk feature
    - Staged file will no longer be shown after all titles
      have been ordered and import_status in import_batches
      is correctly  set to 'imported'
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6773772d59d4e4a77c2e0bc7ebb0743dcd4d8946
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Oct 6 13:55:47 2011 +1300

    bug_6974: bugfix: do not create empty record before building input for new biblio
    
    It messes up javascript default values
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4c1ea37e6366fc7a17ece602f73de4d7ebfbd279)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e5f2ddb2be52425e207696a9d7ecd893d6a77cde
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 4 10:43:45 2011 +1300

    Bug 6958 : Fix for leading spaces being stripped on translation
    
    This will re-add any leading spaces, so formatting is not messed
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    - all examples from the bug report are fixed now
    - verified system preferences are still translated
    - verified xslt displays are still translated
    - verified javascript alerts are still translated
    - verified switching languages works
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    (cherry picked from commit 873091dcc84de8856a1da936ab0045351273cc53)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 37ef2f1830d98a75a302d2d8c1dfc294ba230619
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Tue Oct 4 07:37:33 2011 -0700

    Bug 6867: Date last seen ignored on import
    
    The date last seen field (952 $r) and replacement price date (952 $w) were being
    ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
    allow a value to be imported, but if none is, it will use the ISO date of import
    as a default.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4c774d23f9049929b97c7c416ec3196ce4628305
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 27 14:09:45 2011 -0400

    Bug 6633: SCO return button doesn't work
    
    A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
    the fines column even if no fines column header was displaying.
    
    This patch adjusts the scope of several T:T variables on the sco-main template to fix this
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a291cc52ca79ed11e0032e73b380b17f3bf308cb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cac61e967c9a2b1f73aa5097430b96eec03c365a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Sep 21 11:08:33 2011 -0400

    Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
    
    In the 5 places in the label editor, the user's current branch is determined by taking
    the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
    query, since C4::Context->userenv has the immediate access to the branchcode; this is how
    it's summoned in all other points in the Koha code.
    
    This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
    has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 973371a68b1c2a8af7d90afab8db15bda567f606)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 19cd06bbcfd4527a5e0ece3d8786071d7678240d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Sep 28 09:53:34 2011 +1300

    Updating history and about file
    (cherry picked from commit 405ee6844d835322621bad4cfcfa8c359e8878f7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 05b2ca07b61fcfd56431b7d4d4378417d1c6567b
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Sep 27 09:08:33 2011 -0500

    Bug 6927-- Typo in C4::Overdues.pm
    
    Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails
    
    This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 085de44ebdc5bf6431c59b3e60af0277891cd19d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 62520c247a652285b1bbaaa4a0399d4cd38a9334
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Sep 15 09:42:38 2011 -0400

    Fix for Bug 6872 - Can't set default SMS messaging options for patron category
    
    Passing SMS driver preference value to the template so that SMS
    options can be displayed when appropriate.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 5d5c4a67ec5c91770583edb38ce0213dfa6119c7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 27de4e13e4e6c1eb0a5beacd3b48227ccb4c8799
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Aug 31 14:43:09 2011 -0400

    Bug 6801: checkoverdues returns unnecessary fields, causing slowness
    
    Explicitly specifies which fields to return in C4::Overdues::checkoverdues
    SQL:  all of biblio, items, and issues, and everything in biblioitems
    EXCEPT marc, marcxml and timestamp.
    
    Bug 6801: member details page taking long time to load when many checkouts present
    
    This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
    subroutine was being run for every single item a patron (or their relatives) have checked out.
    Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
    I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.
    
    Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
    page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).
    
    Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
    With this patch, the time is reduced to 5 or so seconds.
    
    Big ups to Ian for tenaciously hunting this one down.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9898e6d50ea9c29d1c3198da0766d9dfb8cfeaf8
Author: Larry Baerveldt <larry at bywatersolutions.com>
Date:   Thu Sep 22 16:36:05 2011 -0400

    Bug 4841: biblio-level itemtypes not searchable in advance search by itype
    
    Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d5a886201cd5e2f7615b92ad727ba136eb105bab)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 35edcc2147a9327e5d2263ff7f91fc6ada9aa1bd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 26 14:40:13 2011 +1300

    Adding new developer to history
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/ItemType.pm                                     |   15 +-
 C4/Items.pm                                        |    9 +-
 C4/Members.pm                                      |    6 +-
 C4/Overdues.pm                                     |   31 ++++-
 C4/Ris.pm                                          |  160 ++++++++++----------
 C4/Search.pm                                       |   14 +-
 acqui/addorderiso2709.pl                           |   28 +++-
 acqui/basket.pl                                    |   38 +++--
 acqui/basketgroup.pl                               |   11 +-
 admin/categorie.pl                                 |    1 +
 cataloguing/addbiblio.pl                           |    5 +-
 circ/circulation.pl                                |    8 +-
 docs/history.txt                                   |    6 +-
 etc/zebradb/ccl.properties                         |    2 +-
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    3 +
 .../prog/en/modules/cataloguing/addbiblio.tt       |    2 +-
 .../cataloguing/value_builder/normarc_field_007.tt |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   14 ++-
 .../prog/en/modules/members/moremember.tt          |    2 +-
 .../prog/en/modules/serials/subscription-detail.tt |  152 ++++++++++---------
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 +-
 labels/label-edit-batch.pl                         |    2 +-
 labels/label-manage.pl                             |    2 +-
 members/moremember.pl                              |    8 +-
 misc/cronjobs/printoverdues.sh                     |   18 ++-
 misc/translator/tmpl_process3.pl                   |   21 ++-
 patroncards/edit-batch.pl                          |    2 +-
 patroncards/manage.pl                              |    2 +-
 tools/manage-marc-import.pl                        |    2 +-
 31 files changed, 334 insertions(+), 242 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 08:43:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 06:43:13 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6817
	created. v3.04.00-669-gf7387f2
Message-ID: <E1RCn6P-0006cD-GS@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6817 has been created
        at  f7387f27daa110c9165a5d69024bd5b4fad0757e (commit)

- Log -----------------------------------------------------------------
commit f7387f27daa110c9165a5d69024bd5b4fad0757e
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 5 07:50:29 2011 +0200

    Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
    
    F. Capovila patch ported to TT.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 08:44:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 06:44:07 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-669-gf7387f2
Message-ID: <E1RCn7H-0006d4-37@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f7387f27daa110c9165a5d69024bd5b4fad0757e (commit)
      from  7d599afe6d044db30f4ba7c233fce774dd8020d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 08:51:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 06:51:48 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6403
	created. v3.04.00-671-g7d8c805
Message-ID: <E1RCnEi-0006fD-Ky@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6403 has been created
        at  7d8c805ef44310677065467fc57cf95baedad7c2 (commit)

- Log -----------------------------------------------------------------
commit 7d8c805ef44310677065467fc57cf95baedad7c2
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Sep 26 10:14:41 2011 -0400

    Enh 6403 DB changes: add RecordLocalUseOnReturn syspref
    
    This patch, separate from the main functionality patch, adds the new syspref to the sysprefs.sql
    as well as updatedatabase.pl
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e05d53d50d84e28769cdd6e4a474245ea2ee34f0
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Sep 21 14:35:12 2011 -0400

    Enh 6403: Record local use stats when checking in unissued materials
    
    Adds a new system preference, RecordLocalUseOnReturn, which when active will change the statistical
    entry type from "return" to "localuse" in AddReturn() if the material was not on loan when returned.
    The intended use-case here is for libraries with 'open' book drops, in which patrons can put locally
    used (but unissued) materials.
    
    Adds a small message to the user interface to confirm that Local Use was recorded.
    
    This change opens up the possibility to record more types of statistics on return; one would just need
    to update the $stat_type variable accordingly.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 08:53:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 06:53:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-672-ged73fb5
Message-ID: <E1RCnGd-0006gL-Rj@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  ed73fb53ca6b402a240eb7d2ed414507fcc44290 (commit)
       via  7d8c805ef44310677065467fc57cf95baedad7c2 (commit)
       via  e05d53d50d84e28769cdd6e4a474245ea2ee34f0 (commit)
      from  f7387f27daa110c9165a5d69024bd5b4fad0757e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ed73fb53ca6b402a240eb7d2ed414507fcc44290
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Oct 9 19:53:31 2011 +1300

    Database version bumped

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                                  |   10 ++++++++--
 circ/returns.pl                                    |    3 +++
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 +++++++-
 .../en/modules/admin/preferences/circulation.pref  |    6 ++++++
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 +++
 kohaversion.pl                                     |    2 +-
 7 files changed, 29 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:02:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:02:06 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6405
	created. v3.04.00-673-g8b65b94
Message-ID: <E1RCnOg-0006it-Hj@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6405 has been created
        at  8b65b94636398729e5d919ca2eb6334e8013bdae (commit)

- Log -----------------------------------------------------------------
commit 8b65b94636398729e5d919ca2eb6334e8013bdae
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Wed May 25 15:25:11 2011 +1200

    Bug 6405: added enumchron to reserve copy list
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:02:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:02:56 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-673-g8b65b94
Message-ID: <E1RCnPU-0006jf-C6@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  8b65b94636398729e5d919ca2eb6334e8013bdae (commit)
      from  ed73fb53ca6b402a240eb7d2ed414507fcc44290 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/reserve/request.tt             |    8 ++++++++
 opac/opac-reserve.pl                               |    8 ++++----
 reserve/request.pl                                 |    8 ++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:07:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:07:48 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6616
	created. v3.04.00-674-g78e0754
Message-ID: <E1RCnUC-0006mT-9d@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6616 has been created
        at  78e0754bfc17805d050074d116a3fa0e79546afd (commit)

- Log -----------------------------------------------------------------
commit 78e0754bfc17805d050074d116a3fa0e79546afd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Jul 20 14:18:34 2011 -0400

    Fix for Bug 6616 - Move common table pager markup to include
    
    Created new include for the tablesorter pager markup:
    
    [% INCLUDE 'table-pager.inc' perpage='20' %]
    
    'perpage' variable defines the default items per page for
    the paged table.
    
    Unique changes in branch_transfer_limits.tt:
    
    - Moved tablesorter configuration out of a loop and changed
      it to work by class instead of id (less repeated markup).
    - Corrected an errant TMPL tag.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:08:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:08:39 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-674-g78e0754
Message-ID: <E1RCnV1-0006nT-9t@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  78e0754bfc17805d050074d116a3fa0e79546afd (commit)
      from  8b65b94636398729e5d919ca2eb6334e8013bdae (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/includes/table-pager.inc |   17 ++++++++++
 .../prog/en/modules/admin/auth_tag_structure.tt    |   21 ++----------
 .../prog/en/modules/admin/authorised_values.tt     |   22 ++-----------
 .../en/modules/admin/branch_transfer_limits.tt     |   34 +++++--------------
 .../prog/en/modules/admin/branches.tt              |   21 ++----------
 .../prog/en/modules/admin/categorie.tt             |   21 ++----------
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |   21 ++----------
 .../prog/en/modules/admin/itemtypes.tt             |   21 ++----------
 .../prog/en/modules/admin/marctagstructure.tt      |   21 ++----------
 .../prog/en/modules/members/readingrec.tt          |   21 ++----------
 .../en/modules/reports/guided_reports_start.tt     |   20 ++----------
 11 files changed, 53 insertions(+), 187 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:11:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:11:24 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6689
	created. v3.04.00-675-gde72893
Message-ID: <E1RCnXf-0006on-WD@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6689 has been created
        at  de728937a874620e4015bc400dc496e6f53ed5a5 (commit)

- Log -----------------------------------------------------------------
commit de728937a874620e4015bc400dc496e6f53ed5a5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Jul 20 15:21:17 2011 -0400

    Fix for Bug 6689 - Improve styling of table pager
    
    Adds some style to the table pager include. Also
    styles the pages "1/2" input field so that it
    does not look like an input field (since editing
    the value does nothing).
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:11:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:11:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-675-gde72893
Message-ID: <E1RCnY0-0006pZ-Jg@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  de728937a874620e4015bc400dc496e6f53ed5a5 (commit)
      from  78e0754bfc17805d050074d116a3fa0e79546afd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |   21 ++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:13:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:13:50 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6636
	created. v3.04.00-676-g85b1d6d
Message-ID: <E1RCna2-0006qW-4m@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6636 has been created
        at  85b1d6d55839017e75beede2f9829d4f4ba9e7ee (commit)

- Log -----------------------------------------------------------------
commit 85b1d6d55839017e75beede2f9829d4f4ba9e7ee
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Oct 7 11:56:29 2011 +1300

    Bug 6636 - add 'powered by Koha' text to OPAC footer
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
      QA control: added () inside 2 [% IF %]
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:15:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:15:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-677-gd03148a
Message-ID: <E1RCnc0-0006s5-MW@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d03148a7176005f7f7bf46206b04f46fcd296acf (commit)
       via  85b1d6d55839017e75beede2f9829d4f4ba9e7ee (commit)
      from  de728937a874620e4015bc400dc496e6f53ed5a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d03148a7176005f7f7bf46206b04f46fcd296acf
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Oct 9 20:15:35 2011 +1300

    Bumping database version

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 ++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    7 ++++++
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   12 ++++++++++
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |   23 +++++++++++++-------
 kohaversion.pl                                     |    2 +-
 7 files changed, 44 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:24:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:24:25 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6667
	created. v3.04.00-678-g0cf8194
Message-ID: <E1RCnkH-0006u4-Du@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6667 has been created
        at  0cf8194d5f6d1a401eb78abad88476ef061928c5 (commit)

- Log -----------------------------------------------------------------
commit 0cf8194d5f6d1a401eb78abad88476ef061928c5
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Aug 4 12:57:52 2011 +0100

    Bug 6667 Correct documentation of function
    
    Return list was documented as being in the reverse order
    to how it is returned. Correct the perldoc description
    
    also removed comments which did not help anyone trying
    to make sense of this subroutine
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Just improving text comments. No code changes involved.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 09:24:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 07:24:46 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-678-g0cf8194
Message-ID: <E1RCnkc-0006uq-S5@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  0cf8194d5f6d1a401eb78abad88476ef061928c5 (commit)
      from  d03148a7176005f7f7bf46206b04f46fcd296acf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members.pm |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 14:19:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 12:19:45 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-50-gd030e74
Message-ID: <E1RCsM5-0007mM-Ip@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  d030e746f98c99bfd5ab4825e24a19200a4a8244 (commit)
      from  143479ab2e3eaddcb714ea769e7d50436f6fd7fa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d030e746f98c99bfd5ab4825e24a19200a4a8244
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 5 07:50:29 2011 +0200

    Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
    
    F. Capovila patch ported to TT.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f7387f27daa110c9165a5d69024bd5b4fad0757e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 22:55:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 20:55:01 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6761
	created. v3.04.00-679-ge5c6fc8
Message-ID: <E1RD0Oi-0000ub-V7@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6761 has been created
        at  e5c6fc8a87468d861022f57b3a86ddd76d5e493f (commit)

- Log -----------------------------------------------------------------
commit e5c6fc8a87468d861022f57b3a86ddd76d5e493f
Author: Amit Gupta <amit.gupta at osslabs.biz>
Date:   Fri Oct 7 11:13:41 2011 +0530

    Bug 6761 - Longer userid field
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 23:01:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 21:01:48 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-682-gc42e008
Message-ID: <E1RD0VI-0000wO-LI@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  c42e0084bd4a29f383c7a23724c8255da70ba836 (commit)
       via  4216b980f3580eeec5af60ef030ac39277e587eb (commit)
       via  2ac26883157b95d2e5df75a3d3e26463cf6f887d (commit)
       via  e5c6fc8a87468d861022f57b3a86ddd76d5e493f (commit)
      from  0cf8194d5f6d1a401eb78abad88476ef061928c5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c42e0084bd4a29f383c7a23724c8255da70ba836
Author: Mason James <mtj at kohaaloha.com>
Date:   Mon Oct 10 05:12:07 2011 +1300

    Bug 6992 - add missing tab chars to history.txt
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4216b980f3580eeec5af60ef030ac39277e587eb
Author: Mason James <mtj at kohaaloha.com>
Date:   Mon Oct 10 03:15:44 2011 +1300

    Bug 6991 - correcting committer info and adding company to koha-team page
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2ac26883157b95d2e5df75a3d3e26463cf6f887d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 10 09:58:39 2011 +1300

    Bumping database version

-----------------------------------------------------------------------

Summary of changes:
 docs/history.txt                                 |   36 +++++++++++-----------
 installer/data/mysql/kohastructure.sql           |    2 +-
 installer/data/mysql/updatedatabase.pl           |    6 ++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    3 +-
 kohaversion.pl                                   |    2 +-
 5 files changed, 28 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 23:08:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 21:08:15 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6776
	created. v3.04.00-683-g1064c61
Message-ID: <E1RD0bX-0000y2-Li@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6776 has been created
        at  1064c61a6947da4ba46bd0fbc81cd1e3e7de31b7 (commit)

- Log -----------------------------------------------------------------
commit 1064c61a6947da4ba46bd0fbc81cd1e3e7de31b7
Author: Amit Gupta <amit.gupta at osslabs.biz>
Date:   Fri Oct 7 17:36:12 2011 +0530

    Bug 6776 - Add Checkin tab to patron search tool
    
    The change from tab to 4 spaces.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Oct  9 23:09:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Oct 2011 21:09:20 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-683-g1064c61
Message-ID: <E1RD0ca-0000zN-Dp@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1064c61a6947da4ba46bd0fbc81cd1e3e7de31b7 (commit)
      from  c42e0084bd4a29f383c7a23724c8255da70ba836 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/includes/patron-search.inc             |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 10 11:12:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 10 Oct 2011 09:12:04 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-684-gfd052de
Message-ID: <E1RDBu0-0003io-DQ@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  fd052de5e179a26f9fec32141cc6d0f07b31ad9d (commit)
      from  1064c61a6947da4ba46bd0fbc81cd1e3e7de31b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fd052de5e179a26f9fec32141cc6d0f07b31ad9d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 10 22:10:41 2011 +1300

    Fixing line endings

-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 3758 ++++++++--------
 .../prog/en/xslt/MARC21slim2MODS3-1.xsl            | 5040 ++++++++++----------
 .../prog/en/xslt/MARC21slim2RDFDC.xsl              |  392 +-
 3 files changed, 4595 insertions(+), 4595 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 11 04:28:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Oct 2011 02:28:47 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6902
	created. v3.04.00-686-g0435a1d
Message-ID: <E1RDS5H-0001ut-Cp@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6902 has been created
        at  0435a1d2f50b9380bbb9eef43c8f6d8ad3404e18 (commit)

- Log -----------------------------------------------------------------
commit 0435a1d2f50b9380bbb9eef43c8f6d8ad3404e18
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Sep 21 16:44:41 2011 -0400

    Enh 6902: Novelist Select enhanced content
    
    Adds support for EBSCO's NoveList Select service.  The library provides their user profile
    and password, as well as where they'd like the content to appear on the OPAC page (options are:
    in a tab (default), above holdings table, below holdings table, and under Save Record on the right)
    
    Sponsored by Los Gatos Public Library and EBSCO
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e5ff85d5562330dbd34410249ad04f4a478a0a04
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Sep 21 16:44:41 2011 -0400

    Enh 6902: Novelist Select enhanced content
    
    Adds support for EBSCO's NoveList Select service.  The library provides their user profile
    and password, as well as where they'd like the content to appear on the OPAC page (options are:
    in a tab (default), above holdings table, below holdings table, and under Save Record on the right)
    
    Sponsored by Los Gatos Public Library and EBSCO
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 11 04:30:11 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Oct 2011 02:30:11 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-686-g0435a1d
Message-ID: <E1RDS6d-0001xQ-80@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  0435a1d2f50b9380bbb9eef43c8f6d8ad3404e18 (commit)
       via  e5ff85d5562330dbd34410249ad04f4a478a0a04 (commit)
      from  fd052de5e179a26f9fec32141cc6d0f07b31ad9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/sysprefs.sql                  |    4 ++
 installer/data/mysql/updatedatabase.pl             |   10 +++++
 .../admin/preferences/enhanced_content.pref        |   23 +++++++++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   42 +++++++++++++++++++-
 opac/opac-detail.pl                                |    8 ++++
 5 files changed, 86 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 11 04:32:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Oct 2011 02:32:49 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-687-gd2d42b4
Message-ID: <E1RDS9B-00020b-Ax@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d2d42b47c86d7dd10ccb3f866b090f70cac0140c (commit)
      from  0435a1d2f50b9380bbb9eef43c8f6d8ad3404e18 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d2d42b47c86d7dd10ccb3f866b090f70cac0140c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 11 15:31:23 2011 +1300

    Bumping database version to 3.05.00.015

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    2 +-
 kohaversion.pl                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 22:36:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 20:36:43 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5459
	created. v3.04.00-688-g71defcb
Message-ID: <E1RE5Xf-0003S7-Hf@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5459 has been created
        at  71defcbc6c851f54da223c040aa5d95e0bd43b73 (commit)

- Log -----------------------------------------------------------------
commit 71defcbc6c851f54da223c040aa5d95e0bd43b73
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 11:02:19 2011 +1200

    Bug 5459 - Holds not being shifted when merging biblios
    
    Holds are now shifted and reordered by date placed.
    Holds already marked waiting, or in transit are not reordered.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 22:41:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 20:41:20 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-688-g71defcb
Message-ID: <E1RE5c8-0003UW-Be@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  71defcbc6c851f54da223c040aa5d95e0bd43b73 (commit)
      from  d2d42b47c86d7dd10ccb3f866b090f70cac0140c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Reserves.pm       |   49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 cataloguing/merge.pl |    5 +++++
 2 files changed, 53 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 23:04:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 21:04:59 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5528
	created. v3.04.00-689-gf09e2ca
Message-ID: <E1RE5z1-0003Zt-9S@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_5528 has been created
        at  f09e2ca27ee89860dbdd0ca512735f37fbfaf8a6 (commit)

- Log -----------------------------------------------------------------
commit f09e2ca27ee89860dbdd0ca512735f37fbfaf8a6
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Fri Oct 7 14:45:53 2011 +1300

    Bug 5528: Analytic records support
    
    Display links to parent biblios, show linked items in holdings, allow holds on
    linked items. This uses MARC to maintain relationships.
    
    Sponsored by the Mississippi Department of Archives and History and RapidRadio
    Solution. Originally developed by Savitra Sirohi and Amit Gupta at OSSLabs, with
    UNIMARC support added by Zeno Tajoli. Commits squashed and merge conflicts
    resolved by Chris Cormack from Catalyst. Respect for NORMARC and some small
    framework portability fixes made by Jared Camins-Esakov of C & P Bibliography
    Services.
    
    IMPORTANT NOTE: A bug in the 773 coding for MARC21 was corrected from the
    original OSS Labs code. The 773s generated by the pre-release code did not have
    the first indicator set to '0', which means that they were not supposed to
    display. Going forward, the first indicator will be set correctly, but existing
    records created with this code will no longer appear (they appeared before only
    due to another bug). To correct this, you could globally (or, to make sure you
    only modify records created with the Analytics tool, for records with 773$0)
    change the first indicator of the 773 from blank to '0'.
    
    == Background ==
    An analytic record for an item is a more detailed, monographic biblio for an
    item attached to a serial record .  This is often used for special issues of a
    journal that are released as books on their own (assigned an ISBN, as well as an
    ISSN/volume/issue).  It is important for researchers to be able to search for
    these items both as issues of the serial, and as monographs.  It is equally
    important for the library to not have duplicate item records for the item in
    question to have to keep synchronized.
    
    == Establishing relationships ==
    Analytical records are connected to items belonging to parent or host
    bibliographic records. This can be accomplished by:
    * From an analytical bibliographic record linking to an host item by providing
      the item barcode as input
    * From a host item by using option "analyze", this creates a new empty
      bibliographic record with field 773 (MARC21) populated
    * Running a new CLI script that establishes a relationship between the
      analytical record and the host item identified by the barcode in the
      analytical record's 773$o (MARC21)
    
    == Connecting Records ==
    The relationships are maintained in the MARC records, we have not used database
    tables at all.
    
    == MARC Representation ==
    In MARC21/NORMARC we have used:
    * 773$9 to store the Koha item number of the host item
    * 773$0 to store the Koha biblio number of the host bibliographic record
    
    The above fields are used to display the relationships in various screens in the
    OPAC and the staff interface. Additionally, when populating field 773 with host
    item's details, we have used following MARC 21 mapping:
    * 'a' <= 100/110/111 $a (author main)
    * 'b' <= 250$a (edition)
    * 'd' <= 260$a, 260$b, 260$c (place, publisher, year)
    * 'o' <= barcode
    * 't' <= 245$a (title)
    * 'w' <= (003)001 --> if no 001 is available, we can populate biblionumber
    * 'x' <= 022$a (issn)
    * 'z' <= 020$a (isbn)
    
    In UNIMARC, this code uses:
    * 461$9 to store the Koha item number of the host item
    * 461$0 to store the Koha biblio number of the host bibliographic record
    
    When populating field 461 in UNIMARC, the following mapping is used:
    * 't' <= 200$a (title)
    
    == Treatment of Holds ==
    A key requirement was to allow holds to be placed on host items from the
    analytical record. We have accomplished this by allowing holds on specific
    copies only. Biblio level holds are not allowed. This ensures that holds are
    placed on specific items that are relevant to the analytical record.
    
    == Deleting host items with linked analytical records ==
    As we have not used database tables to maintain relationships, we had to use
    search to find out if any linked analytical records are present. If 1 or more
    analytical are present, we do not allow deletion of items. This is similar to
    what we see when we try to delete authority records.
    
    == Importing analytical records ==
    Analytical records can be imported using bulkmarcimport or the GUI tools. The
    new CLI script can be executed after the import to establish relationships with
    host items. The script will establish relationships using the host item's
    barcode, the barcode must be present in 773$o of the analytical record.
    
    == What if there are two or more copies of the host item? ==
    The current design will require that there be two host (773) fields, one for
    each copy.
    
    == What if there is no barcode available for the host item? ==
    It is still possible to establish a relationship, by populating 773$9 with the
    host's item number. However the CLI script uses barcode in 773$o to establish
    relationships so it won't work where barcodes are unavailable. Also from an
    analytical record, it is possible to establish a relationship to a host item by
    providing the barcode as input, this option will not be available as well.
    
    Commits that added the following features were squashed by Chris Cormack (this
    is not a list of every commit):
    * Display links to host records from biblio detail screens
    * Support for UNIMARC, respecting the system preference 'marcflavor'
    * Support holds from the OPAC
    * Ability to link to items belong to host records from a analytical record
    * Display items belonging to host records in the moredetail page
    * Ability to edit items belonging to host records, also ability to delink from
      them
    * Move get host items code into a C4 routine, also calling the new routine in
      related perl scripts
    * Move host field population to a C4 routine, all changes in pl files to call
      new routine
    * Allow only specific copy holds for analytical records plus changes to use new
      C4 routines
    * Support for holds on items linked via host records
    * Storing bibnumber and itemnumber in subfields 0 and 9, plus other mapping
      changes
    * New command line script that establishes relationships between analytical
      records and host items and bibs. The script looks for host field (MARC21 773)
      in records, and based on barcode in subfield 'o' populates host bibnumber in
      subfield '0' and host itemnumber in subfield '9'. The script can be run after
      an import of analytical records, it can also be run in the crontab to maintain
      the relationships
    * Ability to create analytical records from items, to view linked analytics, and
      prevent deletion of items that have linked analytics
    * New template for catalogue/detail.pl (NOTE: not a new template file, just a
      new way of displaying analytics), template displays linked analytics and
      allows creation of analytical records
    * New zebra index for item number in host fields. This index will be used to
      display links to analytical records from host records
    * Display title of host record instead of the phrase host record
    * Using detail.tmpl for analytics tab instead of a new template file
    * Improved qualification info prepration in Prephostmarcfield
    * Check for linked analytics before deleting item
    * Display link to host record and more meaningful anchor text for edit item link
    * Analytical record: Unimarc index in record.abs and help in
      create_analytical_rel.pl
    * Adding a sys pref that controls display of options to create analytical
      relationships
    * Add host entry in XSLT stylesheet in staff item detail
    * Added host record support to OPAC detail XSLT
    * Adding 773$0 and 773$9 to all frameworks
    * Adding 773 subfields 0 and 9 to default marc framework via updatedatabase.pl
    * Display create analytics and used in links in catalog detail
    * Fixed problem where analytical records not showing in OPAC search results
      because GetMarcBiblio now needs a flag to add item records
    * Fixed problem where analytics count was set to 1 for all records, not just
      those with analytics
    * Fixed catalogue detail page not to show analytics counts if count is 0
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl
    	koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
    	kohaversion.pl
    
    Co-author: Savitra Sirohi <savitra.sirohi at osslabs.biz>
    Co-author: Zeno Tajoli <tajoli at cilea.it>
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 23:20:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 21:20:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-689-gf09e2ca
Message-ID: <E1RE6EJ-0003e5-Kc@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f09e2ca27ee89860dbdd0ca512735f37fbfaf8a6 (commit)
      from  71defcbc6c851f54da223c040aa5d95e0bd43b73 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |    1 +
 C4/Biblio.pm                                       |  124 +++++++++++++++
 C4/Items.pm                                        |  157 +++++++++++++++++---
 C4/Reserves.pm                                     |    8 +
 C4/Search.pm                                       |   27 ++++
 catalogue/detail.pl                                |   42 +++++-
 catalogue/moredetail.pl                            |   18 +++
 cataloguing/addbiblio.pl                           |   18 ++-
 cataloguing/additem.pl                             |   57 +++++++
 cataloguing/{moveitem.pl => linkitem.pl}           |   74 ++++-----
 etc/zebradb/biblios/etc/bib1.att                   |    2 +-
 etc/zebradb/ccl.properties                         |    3 +
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    3 +-
 etc/zebradb/marc_defs/unimarc/biblios/record.abs   |    3 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +
 .../optional/marc21_simple_bib_frameworks.sql      |   16 ++
 installer/data/mysql/sysprefs.sql                  |    2 +
 installer/data/mysql/updatedatabase.pl             |   23 +++
 .../prog/en/includes/biblio-view-menu.inc          |    1 +
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    2 +
 .../en/modules/admin/preferences/cataloguing.pref  |    6 +
 .../prog/en/modules/catalogue/detail.tt            |   16 ++-
 .../prog/en/modules/cataloguing/additem.tt         |    7 +-
 .../prog/en/modules/cataloguing/linkitem.tt        |   57 +++++++
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    5 +
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    5 +
 misc/migration_tools/create_analytical_rel.pl      |  152 +++++++++++++++++++
 opac/opac-detail.pl                                |   24 +++-
 opac/opac-reserve.pl                               |   36 +++++-
 reserve/placerequest.pl                            |    9 +
 reserve/request.pl                                 |   16 ++-
 31 files changed, 840 insertions(+), 76 deletions(-)
 copy cataloguing/{moveitem.pl => linkitem.pl} (56%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
 create mode 100755 misc/migration_tools/create_analytical_rel.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 23:22:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 21:22:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-690-gd205c27
Message-ID: <E1RE6GL-0003eu-47@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d205c2795799821bfb560109b841eafac7b239b1 (commit)
      from  f09e2ca27ee89860dbdd0ca512735f37fbfaf8a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d205c2795799821bfb560109b841eafac7b239b1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 13 10:22:34 2011 +1300

    Bumping db version

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |   46 ++++++++++++++++----------------
 kohaversion.pl                         |    2 +-
 2 files changed, 24 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 23:51:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 21:51:56 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5630
	created. v3.04.00-693-g1c0702c
Message-ID: <E1RE6iS-0003mp-GB@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5630 has been created
        at  1c0702c76e50173289a0ee340a9c5f190515d9c3 (commit)

- Log -----------------------------------------------------------------
commit 1c0702c76e50173289a0ee340a9c5f190515d9c3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 2 18:12:10 2011 +0200

    Bug 5630, follow-up
    
    Fixes chris comment 28, that was a consequence of Marcel comment 27
    Recent error
    [Thu Sep 01 14:22:45 2011] [error] [client 192.87.126.61] [Thu Sep  1 14:22:45
    2011] opac-MARCdetail.pl: DBD::mysql::st execute failed: Unknown column
    'limit_desc' in 'field list' at /usr/share/koha/testclone/C4/Auth.pm line 276.
    Seems to come from this commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c (5630
    CAS Improvements)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 74c7c4e3a5d6a3ec20b525936c5ffe2f9b188744
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Aug 30 10:41:10 2011 -0400

    Bug 5630 Followup: checkpw_ldap not imported
    
    If LDAP authentication is used, Koha barks that C4::Auth::checkpw_ldap is
    undefined, which is true.  checkpw_ldap needs to be imported from C4::Auth_with_ldap,
    like it was before the bug fix for 5630
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 046c996c2fa8150b8c6a037976c9c22826e04b8b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Mar 31 10:06:46 2011 +1300

    Bug 5630 CAS improvements
    
    Squashed commit of the following:
    
    commit 0e13a5278e11b288e48190dc26f31e96d06598dd
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:39 2011 +0100
    
        Bug 5630 : fixing C4/Auth.pm
    
    commit b55abc7a0dc1ca43b2610a27246293e9a9346e18
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:38 2011 +0100
    
        Bug 5630 : Adds CAS documentation
    
    commit df0098a6a65465e6e734f99f65fb453dd3fa11d1
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:37 2011 +0100
    
        Bug 5630 : ilsdi service AuthenticatePatron doesn't with CAS syspref on
    
        Signed-off-by: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    
    commit 31c8f0c0facfafae011ad24c9d458c50f2fad296
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:36 2011 +0100
    
        Bug 5630 : Adds the ability to authenticate against multiple CAS servers
    
    commit 9d0def826135d5756533dc0dcf8e0a107d1ac8fc
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:34 2011 +0100
    
        Auth_with_cas : removing a warning
    
        $sth was defined twice in a function
        Removing the second definition
    
    commit 5ee550e9a2bb7ab6bc09f14fced6ce0df8011eb0
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:33 2011 +0100
    
        Bug 6012 : MT 2270: CAS proxy
    
        CAS Proxy
        Examples included are now really usable
    
        Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 12 23:54:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 21:54:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-693-g1c0702c
Message-ID: <E1RE6kl-0003oa-So@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1c0702c76e50173289a0ee340a9c5f190515d9c3 (commit)
       via  74c7c4e3a5d6a3ec20b525936c5ffe2f9b188744 (commit)
       via  046c996c2fa8150b8c6a037976c9c22826e04b8b (commit)
      from  d205c2795799821bfb560109b841eafac7b239b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                       |  117 +++++++++-----
 C4/Auth_cas_servers.yaml.orig                    |   12 ++
 C4/Auth_with_cas.pm                              |  181 +++++++++++++++++-----
 docs/CAS/CAS/README                              |    8 +
 docs/CAS/CASProxy/README                         |    9 +
 docs/CAS/CASProxy/examples/casSession.tmp        |  Bin 0 -> 134 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl    |   58 +++++++
 docs/CAS/CASProxy/examples/proxy_cas.pl          |   91 +++++++++++
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl |   62 ++++++++
 docs/CAS/CASProxy/examples/proxy_cas_data.pl     |   80 ++++++++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt |   14 ++-
 11 files changed, 547 insertions(+), 85 deletions(-)
 create mode 100644 C4/Auth_cas_servers.yaml.orig
 create mode 100644 docs/CAS/CAS/README
 create mode 100644 docs/CAS/CASProxy/README
 create mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 create mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 00:08:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 22:08:00 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6977
	created. v3.04.00-694-gf977264
Message-ID: <E1RE6y0-0003uI-1K@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6977 has been created
        at  f97726406697f7973d2f8118049acaac2f95a3ed (commit)

- Log -----------------------------------------------------------------
commit f97726406697f7973d2f8118049acaac2f95a3ed
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Wed Oct 5 13:16:37 2011 -0400

    Bug 6977 : Adds support for repeatable subfields when importing authorities.
    
    Before this patch, if we tried to import an authority with multiple $x
    subfields into a bibliographic record, only the last value get added
    to the form.
    
    All repeated values should now be sent to the form.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 00:08:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 22:08:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-694-gf977264
Message-ID: <E1RE6yM-0003v5-V4@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f97726406697f7973d2f8118049acaac2f95a3ed (commit)
      from  1c0702c76e50173289a0ee340a9c5f190515d9c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 authorities/blinddetail-biblio-search.pl           |   21 +++++-
 .../authorities/blinddetail-biblio-search.tt       |   79 +++++++++++++++++---
 2 files changed, 86 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 00:15:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 22:15:35 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5898
	created. v3.04.00-695-g7f6656a
Message-ID: <E1RE75L-0003xt-Ck@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5898 has been created
        at  7f6656aff84b2e9e47dd3317e8c72d69aaa8e433 (commit)

- Log -----------------------------------------------------------------
commit 7f6656aff84b2e9e47dd3317e8c72d69aaa8e433
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 23 11:49:37 2011 -0400

    Fix for Bug 5898 - search to hold feature not clearing
    
    Search to hold cookie is now cleared when the user loads a blank
    circulation page and when the user logs out.
    
    The user also now has the option to "forget" the current
    search to hold patron by choosing an option from the
    search to hold menu on the search results page.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Tested:
    Forget <patron> from search to hold results clears cookie
    Logging out clears the cookie - testing note: i had to clear my cookies and test fresh before this would work
    Loading a blank circulation page (Check Out from the circulation-home) clears the cookie.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 00:15:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 12 Oct 2011 22:15:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-695-g7f6656a
Message-ID: <E1RE75i-0003yf-9F@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  7f6656aff84b2e9e47dd3317e8c72d69aaa8e433 (commit)
      from  f97726406697f7973d2f8118049acaac2f95a3ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |   12 ++++++++++
 .../intranet-tmpl/prog/en/includes/header.inc      |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    4 +++
 .../prog/en/modules/catalogue/results.tt           |   22 ++++++++++++++++---
 .../prog/en/modules/circ/circulation.tt            |    2 +-
 5 files changed, 37 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:46:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:46:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6278
	created. v3.04.00-696-ga4baa4d
Message-ID: <E1REBJk-0005Na-PZ@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6278 has been created
        at  a4baa4df1843f1390f372d1569eb446171705742 (commit)

- Log -----------------------------------------------------------------
commit a4baa4df1843f1390f372d1569eb446171705742
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 1 11:53:16 2011 +0200

    6278 Funny translation bug with XSLT subfieldSelect parameters
    
    This patch resolves the situation of translating the parameters at (meaning subfield a and t) of subfieldSelect by replacing at with a_t. This string will not be translated and the xslt function subfieldSelect just ignores the underscore.
    It is a pragmatic and easy solution. Theoretically, we should look for a solution in the translation parser. This is much harder and would probably not result in better code in those modules.
    
    Test this patch with the following remarks in mind:
    1) This patch deals with XSLT. So you should enable XSLT at OPAC detail.
    2) In English or any language not translating the word at: Just check if the links for a MARC 490, 773, 780 or 785 still work at the opac detail page.
    3) For a language translating the word at (like Dutch where at becomes bij), you should first rerun your translation process (at least for the OPAC).
    4) In that language: Check the results on the vernacular opac detail page for MARC 490, 773, 780 or 785. Without the patch, you would not see a link following e.g. the Series label (with 490 first indicator set to 1). With the patch, you should see a link now.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Pragmatic solution for an annoying problem.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:47:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:47:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-696-ga4baa4d
Message-ID: <E1REBKM-0005OU-W1@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a4baa4df1843f1390f372d1569eb446171705742 (commit)
      from  7f6656aff84b2e9e47dd3317e8c72d69aaa8e433 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   10 +++++-----
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |    4 ++--
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:55:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:55:21 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6885
	created. v3.04.00-698-gcdd798e
Message-ID: <E1REBS5-0005Ps-0Q@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6885 has been created
        at  cdd798ec3216c6019adccc40935e93736ce4dc3b (commit)

- Log -----------------------------------------------------------------
commit cdd798ec3216c6019adccc40935e93736ce4dc3b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 13 15:54:48 2011 +1300

    Bug 6885 Follow up to fix superlibarian permission check

commit b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 19 19:53:38 2011 +0200

    Bug 6885 Allow superlib to delete items from any library
    
    When IndependantBranches syspref is enabled, a 'regular' user can only
    delete items belonging to his/her library. But a superlibrarian should
    have the permission to delete items from all libraries. He can't for the
    time being. This is fix by this patch.
    
    How to test?
    
    - On a multi-libraries Koha, activate IndependantBranches
    - Log in with a superlibrarian user
    - Find a biblio with one item from another library than the user home
      library
    - Click on Edit > Edit Items
    - On the list of items, all lines have Delete link
    - If you try to delete an item from another library than the user home
      library, deletion will fail.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:55:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:55:59 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-698-gcdd798e
Message-ID: <E1REBSg-0005Qf-Uw@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  cdd798ec3216c6019adccc40935e93736ce4dc3b (commit)
       via  b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d (commit)
      from  a4baa4df1843f1390f372d1569eb446171705742 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Items.pm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:58:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:58:00 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6912
	created. v3.04.00-699-g7621591
Message-ID: <E1REBUe-0005SL-GE@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6912 has been created
        at  7621591ae697328798a44a95757352a147e33d72 (commit)

- Log -----------------------------------------------------------------
commit 7621591ae697328798a44a95757352a147e33d72
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sun Sep 25 11:25:25 2011 +0200

    Bug 6912 Test 008 presence in get CoinS function
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 04:58:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 02:58:12 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-699-g7621591
Message-ID: <E1REBUq-0005T7-H2@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  7621591ae697328798a44a95757352a147e33d72 (commit)
      from  cdd798ec3216c6019adccc40935e93736ce4dc3b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Biblio.pm |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 05:18:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 03:18:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6840
	created. v3.04.00-700-g37902b2
Message-ID: <E1REBo7-0005aP-JP@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6840 has been created
        at  37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d (commit)

- Log -----------------------------------------------------------------
commit 37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 2 18:39:53 2011 +0200

    Bug 6840 warning in logs
    
    In staff interface, in search (catalogue/search.pl), there is a warning saying:
    [Fri Sep  2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
    element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.
    
    The problem happens when searching from the quick search toolbar, not when you
    search from advanced search.
    Investigating, it seems it's because the sort_by is not defined in this case.
    
    This patch
    * fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
    * modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 05:20:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 03:20:41 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-701-g5187108
Message-ID: <E1REBqb-0005bj-Bd@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  518710878972a72b8d7b306af571b7c543267ddd (commit)
       via  37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d (commit)
      from  7621591ae697328798a44a95757352a147e33d72 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 518710878972a72b8d7b306af571b7c543267ddd
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date:   Tue Sep 27 18:53:52 2011 +0200

    Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/Templates.pm                                    |    6 +++++-
 catalogue/search.pl                                |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 10:59:05 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 08:59:05 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6938
	created. v3.04.00-702-g2f11d52
Message-ID: <E1REH85-00070F-1J@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6938 has been created
        at  2f11d527a0749e86350d62055f289aaee9435848 (commit)

- Log -----------------------------------------------------------------
commit 2f11d527a0749e86350d62055f289aaee9435848
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 29 18:05:49 2011 +1300

    Bug 6938 - replace two subscription fields that were incorrectly removed
    
    The "Note for OPAC" and "Note for staff" fields in subscriptions were
    removed, but they are their own fields in the database and display in
    other places too. This patch puts them back so that they can once again
    be edited.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 10:59:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 08:59:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-702-g2f11d52
Message-ID: <E1REH8r-000712-Rk@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  2f11d527a0749e86350d62055f289aaee9435848 (commit)
      from  518710878972a72b8d7b306af571b7c543267ddd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/serials/subscription-add.tt    |   41 +++++++++++--------
 .../prog/en/modules/serials/subscription-detail.tt |    2 +
 2 files changed, 26 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 23:17:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 21:17:57 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6519
	created. v3.04.00-703-g31d7486
Message-ID: <E1RESf7-0001S8-1e@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6519 has been created
        at  31d748665a396582ad344249c3dfd394b6047f85 (commit)

- Log -----------------------------------------------------------------
commit 31d748665a396582ad344249c3dfd394b6047f85
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 29 11:53:33 2011 +1200

    Bug 6519 : Changing analytic searches from Title: to ti,phr
    
    To test, you should get similar but better results when clicking a
    volume or set title from a record that is part of a set, (or a single
    volume)
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Note: if you are using $w for record linking you have to turn system
    preference UseControlnumber off to test this patch.
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 23:20:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 21:20:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-703-g31d7486
Message-ID: <E1RESh8-0001TB-6s@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  31d748665a396582ad344249c3dfd394b6047f85 (commit)
      from  2f11d527a0749e86350d62055f289aaee9435848 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    8 ++++----
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 23:38:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 21:38:14 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5780
	created. v3.04.00-705-g72eeac5
Message-ID: <E1RESyk-0001YR-Fq@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5780 has been created
        at  72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755 (commit)

- Log -----------------------------------------------------------------
commit 72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 30 15:27:27 2011 -0400

    bug 5780 followup: RIS export now includes all URLs
    
    Also cleanup whitespace and adjust the line ending per
    bug 6769.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 412666e52b4e8f7bc5ae70f2b2978b1bd088a885
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Feb 21 10:29:48 2011 +1300

    Bug 5780 - Export the URI as part of a RIS export
    
    Squashed commit of the following:
    
    commit 8486cd30caf879ddff93aaa5fab722838db946a1
    Author: Chris Cormack <chrisc at catalyst.net.nz>
    Date:   Mon Feb 21 10:23:07 2011 +1300
    
        WR76962 - Fixing typos
    
    commit f3ac9d9233db2b410fded112e16e54b27280af0a
    Author: Chris Cormack <chrisc at catalyst.net.nz>
    Date:   Mon Feb 21 09:56:43 2011 +1300
    
        WR76962 - Extending RIS support to handle URI
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 13 23:42:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 21:42:30 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-705-g72eeac5
Message-ID: <E1RET2s-0001aa-Br@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755 (commit)
       via  412666e52b4e8f7bc5ae70f2b2978b1bd088a885 (commit)
      from  31d748665a396582ad344249c3dfd394b6047f85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Ris.pm |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:03:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:03:52 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6807
	created. v3.04.00-706-g6c9ab36
Message-ID: <E1RETNY-0001et-5S@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6807 has been created
        at  6c9ab3678a9ab747eb9f5a89a4a6972a861fa9ca (commit)

- Log -----------------------------------------------------------------
commit 6c9ab3678a9ab747eb9f5a89a4a6972a861fa9ca
Author: Amit Gupta <amit.gupta at osslabs.biz>
Date:   Tue Aug 30 12:23:54 2011 +0530

    Bug 6807 - Add ISBN filter to advanced order search.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:05:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:05:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-706-g6c9ab36
Message-ID: <E1RETPT-0001g6-J3@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  6c9ab3678a9ab747eb9f5a89a4a6972a861fa9ca (commit)
      from  72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Acquisition.pm                                  |    8 ++++++++
 acqui/histsearch.pl                                |    5 ++++-
 .../prog/en/modules/acqui/histsearch.tt            |    3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:27:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:27:00 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6825
	created. v3.04.00-707-gd7cbdd3
Message-ID: <E1RETjw-0001kf-Rx@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6825 has been created
        at  d7cbdd3d0bcc4bf06f65ed1fec16d506fa8f217f (commit)

- Log -----------------------------------------------------------------
commit d7cbdd3d0bcc4bf06f65ed1fec16d506fa8f217f
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Wed Aug 31 11:54:26 2011 +0200

    Bug 6825 OpacNav menu hide user menu on opac-user.pl page
    
    This patch add a new syspref OpacNavBottom which is placed on all pages
    after OpacNav. On Patron pages, specif patron links are placed between
    OpacNav and OpacNavBottom, like this:
    
      OpacNav
      Patron links
      OpacNavBottom
    
    To test:
    
      1 Apply this patch
      2 For RM, modify kohaversion.pl and updatedatabase.pl appropriately
      3 Test that OPAC pages are displayed as before, OpacNav on the left
      4 Test OPAC patron pages: OpacNav is as before displayed after patron
        links
      5 Split OpacNav between itself and OpacNavBottom
      6 Patron pages display patron links between OpacNav and OpacNavBottom
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:29:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:29:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-707-gd7cbdd3
Message-ID: <E1RETmo-0001lu-2m@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d7cbdd3d0bcc4bf06f65ed1fec16d506fa8f217f (commit)
      from  6c9ab3678a9ab747eb9f5a89a4a6972a861fa9ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |    2 ++
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    5 +++++
 .../opac-tmpl/prog/en/includes/navigation.inc      |    7 ++++++-
 .../opac-tmpl/prog/en/modules/opac-account.tt      |    3 +--
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    3 +--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |    3 +--
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    3 +--
 .../prog/en/modules/opac-readingrecord.tt          |    3 +--
 .../prog/en/modules/opac-search-history.tt         |    6 ++----
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    3 +--
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    3 +--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    3 +--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    3 +--
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    3 +--
 16 files changed, 34 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:31:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:31:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-708-gb83c389
Message-ID: <E1REToX-0001nJ-Ex@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  b83c3896456a20ad3612e4f91e4b63fcaf3bfb02 (commit)
      from  d7cbdd3d0bcc4bf06f65ed1fec16d506fa8f217f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b83c3896456a20ad3612e4f91e4b63fcaf3bfb02
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Oct 14 11:31:30 2011 +1300

    Bumping database version

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    2 +-
 kohaversion.pl                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:41:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:41:02 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6862
	created. v3.04.00-709-gebd03e3
Message-ID: <E1RETxV-0001pf-Ur@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6862 has been created
        at  ebd03e31e2a1cf2c30b97f2af48e283212d7a49a (commit)

- Log -----------------------------------------------------------------
commit ebd03e31e2a1cf2c30b97f2af48e283212d7a49a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 11:17:19 2011 -0400

    Bug 6862: Duplicate VOKAL Book icons
    
    Removes duplicate VOKAL icons for Book.png and Book-32px.png.  Database updated in both
    itemtypes and authorised_values tables to reflect change, so no icon loss should be seen
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 00:46:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 13 Oct 2011 22:46:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-710-gf85c06d
Message-ID: <E1REU2u-0001ra-Em@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f85c06d0c0330bc4512db8000b9898ac75fe7481 (commit)
       via  ebd03e31e2a1cf2c30b97f2af48e283212d7a49a (commit)
      from  b83c3896456a20ad3612e4f91e4b63fcaf3bfb02 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f85c06d0c0330bc4512db8000b9898ac75fe7481
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Oct 14 11:44:35 2011 +1300

    Bumping database version

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl             |   10 ++++++++++
 .../prog/img/itemtypeimg/vokal/BOOK-32px.png       |  Bin 897 -> 0 bytes
 .../prog/img/itemtypeimg/vokal/BOOK.png            |  Bin 3825 -> 0 bytes
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png |  Bin 897 -> 0 bytes
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK.png      |  Bin 3825 -> 0 bytes
 kohaversion.pl                                     |    2 +-
 6 files changed, 11 insertions(+), 1 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 04:59:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 14 Oct 2011 02:59:14 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6970
	created. v3.04.00-711-gd139d40
Message-ID: <E1REXzO-0003OF-BU@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6970 has been created
        at  d139d400b11e76f19ed208d4898d57f678acf9f4 (commit)

- Log -----------------------------------------------------------------
commit d139d400b11e76f19ed208d4898d57f678acf9f4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Oct 5 09:53:02 2011 -0400

    Fix for Bug 6970 - logout not redirecting to login page
    
    For some reason the latest version of Firefox doesn't like
    the javascript which empties the cart on logout. As Ian points
    out, there is code which tries to redirect to "about:blank"
    and close the window (since the main context of the function
    is the Cart's popup window.
    
    This patch adds a parameter to the delBasket function so
    that we can pass a "popup" context to the function and
    choose whether or not we want to ask JS to close the window.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 14 05:00:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 14 Oct 2011 03:00:27 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-711-gd139d40
Message-ID: <E1REY0Y-0003Pb-U0@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d139d400b11e76f19ed208d4898d57f678acf9f4 (commit)
      from  f85c06d0c0330bc4512db8000b9898ac75fe7481 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |   15 ++++++++++-----
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 01:58:41 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 14 Oct 2011 23:58:41 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5995
	updated. v3.04.00-39-gdcb4ac7
Message-ID: <E1REreD-0008Vy-Se@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5995 has been updated
       via  dcb4ac77fbfd813cc0eb39e060b49a7b8d491016 (commit)
      from  417c9084b4c5a3637ffc2a29d4f3db929285fead (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dcb4ac77fbfd813cc0eb39e060b49a7b8d491016
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 14 16:37:54 2011 -0400

    Bug 5995 Followup: checkpw was returning inconsistent values
    
    In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
    userid.  This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
    uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
    desired value in the right way.

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm           |   10 +++++-----
 C4/Auth_with_ldap.pm |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 02:26:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 00:26:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-713-ga118102
Message-ID: <E1REs4j-0000ko-WC@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7 (commit)
       via  dcb4ac77fbfd813cc0eb39e060b49a7b8d491016 (commit)
      from  d139d400b11e76f19ed208d4898d57f678acf9f4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7
Merge: d139d40 dcb4ac7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 15 12:59:34 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm           |   10 +++++-----
 C4/Auth_with_ldap.pm |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 02:47:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 00:47:50 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6789
	created. v3.04.00-714-g4e95e94
Message-ID: <E1REsPm-00012t-SP@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6789 has been created
        at  4e95e94727b09b33d2f6c597bdd218a59dcc3681 (commit)

- Log -----------------------------------------------------------------
commit 4e95e94727b09b33d2f6c597bdd218a59dcc3681
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Aug 25 18:32:51 2011 -0400

    Bug 6789: biblios with many items can result in broken search results link
    
    This patch fixes an issue whereby biblios with many items (often > 500) would index,
    but not the biblionumber itself, resulting in search results with a) inaccurate item counts
    and b) no biblionumber to use in the link to the details page.  This is due to Net::Z3950::ZOOM  not providing
    a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
    if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields.  Since
    it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.
    
    This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
    so the 999$c will come before the item records.  It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
    content, as this would break the ISO-2709 standard by a large factor.
    
    To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
    and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last).  fix_biblio_ids
    is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.
    
    It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
    rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio.  Simpler and cleaner that way.
    
    To verify bug issue:
    1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
    2. search for this biblio (in a search that would return multiple results, not just this title).  You should get the title in
    the results list
    3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404
    
    To test solution:
    1. Apply patch
    2. modify the biblio slightly (click the 005 for example) and save
       OR manually add the biblio to zebraqueue for reindexing
    3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
    4. click the link, and find yourself on the biblio detail page as desired
    
    Signed-off-by: D Ruth Bavousett <ruth at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 02:56:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 00:56:15 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-714-g4e95e94
Message-ID: <E1REsXv-0001Aj-Im@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  4e95e94727b09b33d2f6c597bdd218a59dcc3681 (commit)
      from  a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Biblio.pm                          |    4 ++--
 misc/migration_tools/rebuild_zebra.pl |    9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 02:58:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 00:58:20 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6806
	created. v3.04.00-715-gd010412
Message-ID: <E1REsZw-0001Ce-3o@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6806 has been created
        at  d010412c66a9291d13676ed7a3fbdaaf1b269b59 (commit)

- Log -----------------------------------------------------------------
commit d010412c66a9291d13676ed7a3fbdaaf1b269b59
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Aug 30 14:58:36 2011 +0100

    Bug 6806 Fix encoding of title in subscription-add
    
    Port of Maxime Pelletier <maxime.pelletier at libeo.com>'s patch for
    3.2 to TT
    Stops the mangling of titles containing accented characters
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 02:58:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 00:58:47 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-715-gd010412
Message-ID: <E1REsaN-0001Dg-GJ@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d010412c66a9291d13676ed7a3fbdaaf1b269b59 (commit)
      from  4e95e94727b09b33d2f6c597bdd218a59dcc3681 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/serials/result.tt              |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:00:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:00:47 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6915
	created. v3.04.00-716-ge5e5e31
Message-ID: <E1REscJ-0001Fv-88@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6915 has been created
        at  e5e5e3155e4c4b3f51415d08a324f84142e91f3d (commit)

- Log -----------------------------------------------------------------
commit e5e5e3155e4c4b3f51415d08a324f84142e91f3d
Author: Greg Barniskis <gbarniskis at gmail.com>
Date:   Mon Sep 26 12:07:20 2011 -0500

    Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl
    
    Widen module name allowance in the format statement, adjust other
    columns to be generous but not-so-much as before, modify report
    header and footer print statements to align and clarify. Very very
    long module names or version numbers are still subject to possible
    truncation.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    
    Sign off comment: With this patch module names are not truncated, which is an
    improvement. Lines are still too long to fit an 80 column display, and so they
    wrap around, but tht is a minor annoyance compared to the truncated names.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:01:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:01:39 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-716-ge5e5e31
Message-ID: <E1REsd9-0001Ha-Cg@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  e5e5e3155e4c4b3f51415d08a324f84142e91f3d (commit)
      from  d010412c66a9291d13676ed7a3fbdaaf1b269b59 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 koha_perl_deps.pl |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:10:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:10:35 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-717-g1576e3f
Message-ID: <E1REsln-0001Oy-E0@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1576e3f410b3c4914d1b803953f64e32c20d3e74 (commit)
      from  e5e5e3155e4c4b3f51415d08a324f84142e91f3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1576e3f410b3c4914d1b803953f64e32c20d3e74
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 15 14:10:04 2011 +1300

    Adding another developer to the history

-----------------------------------------------------------------------

Summary of changes:
 docs/history.txt                                 |    3 +++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:15:18 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:15:18 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6904
	created. v3.04.00-718-g087bb15
Message-ID: <E1REsqM-0001TI-38@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6904 has been created
        at  087bb15e7003cb1f5e271b5b88c1abb99f33c89c (commit)

- Log -----------------------------------------------------------------
commit 087bb15e7003cb1f5e271b5b88c1abb99f33c89c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Oct 13 07:33:39 2011 +0200

    Bug 6904: Changes 'asked' to 'pending' in suggestions for more consistency
    
    In some places the suggestions were 'pending' in others the same status
    was named 'pending'. This patch changes the status to 'pending' in all
    places on the suggestion page to make it more consistent.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:15:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:15:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-718-g087bb15
Message-ID: <E1REsqx-0001UP-1D@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  087bb15e7003cb1f5e271b5b88c1abb99f33c89c (commit)
      from  1576e3f410b3c4914d1b803953f64e32c20d3e74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/suggestion/suggestion.tt       |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:17:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:17:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6942
	created. v3.04.00-720-g5affbfc
Message-ID: <E1REssh-0001WZ-UI@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6942 has been created
        at  5affbfc9fd5b6e5974aa9e64d074235046359950 (commit)

- Log -----------------------------------------------------------------
commit 5affbfc9fd5b6e5974aa9e64d074235046359950
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 29 12:31:09 2011 -0500

    Bug 6942 - Add link to manual to help/authorities/authorities-home.tt
    
    To test:
    Verify link to manual shows on authorities home page in-app help.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>

commit a43974029205fb830eef8989b8a5899d0561840d
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 29 12:26:07 2011 -0500

    Bug 6942 - Add link to manual to help/admin/admin-home.tt
    
    To test:
    Verify link to manual shows on administration home page in-app help.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:18:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:18:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-720-g5affbfc
Message-ID: <E1REstT-0001Xp-G5@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  5affbfc9fd5b6e5974aa9e64d074235046359950 (commit)
       via  a43974029205fb830eef8989b8a5899d0561840d (commit)
      from  087bb15e7003cb1f5e271b5b88c1abb99f33c89c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/help/admin/admin-home.tt       |    4 +++-
 .../modules/help/authorities/authorities-home.tt   |    3 +++
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:21:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:21:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7019
	created. v3.04.00-721-gbfaf07b
Message-ID: <E1REswQ-0001aS-3E@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7019 has been created
        at  bfaf07b2780ed033677683ef40ce04e55d7c2b3d (commit)

- Log -----------------------------------------------------------------
commit bfaf07b2780ed033677683ef40ce04e55d7c2b3d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 13 11:59:48 2011 -0400

    Fix for Bug 7019 - Circulation History Sort Order Wrong
    
    The return column sort was not using the right sort algorithm
    because it was confused by the combination of date data and
    text data ("Checked out"). I've added an explicit instruction
    to sort by date. The downside to this change is that checked
    out items are sorted with the oldest checkouts rather than
    the newest:
    
    Checked Out
    Checked Out
    10/14/1988
    07/14/2005
    
    Not perfect, but an improvement over completely incorrect
    sorting. This patch also adds the necessary check for system
    dateformat preference to properly sort metric dates.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 03:21:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 01:21:57 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-721-gbfaf07b
Message-ID: <E1REswn-0001bq-D6@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  bfaf07b2780ed033677683ef40ce04e55d7c2b3d (commit)
      from  5affbfc9fd5b6e5974aa9e64d074235046359950 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/members/readingrec.tt          |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 08:56:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 06:56:49 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7024
	created. v3.04.00-722-g41928b0
Message-ID: <E1REyAq-0003aI-V1@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7024 has been created
        at  41928b088075a5da9bffb19edf906e94aa84466f (commit)

- Log -----------------------------------------------------------------
commit 41928b088075a5da9bffb19edf906e94aa84466f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 13 10:02:38 2011 -0400

    Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
    
    The display of messages "to the patron" on the checkout screen
    lacked the same logic controlling messages "to other librarians,"
    affecting conditions under which the [Delete] link would be shown.
    This match makes the two categories consistent with each other:
    A delete link will be shown if the logged in branch matches the
    branch where the message was set OR if AllowAllMessageDeletion
    is turned on.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 15 09:15:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 15 Oct 2011 07:15:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-722-g41928b0
Message-ID: <E1REyTI-0003fD-4e@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  41928b088075a5da9bffb19edf906e94aa84466f (commit)
      from  bfaf07b2780ed033677683ef40ce04e55d7c2b3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/circ/circulation.tt            |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:03:11 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:03:11 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5533
	created. v3.04.00-723-g4770555
Message-ID: <E1RFtOx-0008CS-Nv@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5533 has been created
        at  4770555855930e45eeaedd1e25a9a39af0861604 (commit)

- Log -----------------------------------------------------------------
commit 4770555855930e45eeaedd1e25a9a39af0861604
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Mon Oct 17 15:31:29 2011 +1300

    bug_5533: Slightly improved marking items as lost
    
    Call LostItem() whenever item is lost.
    LostItem() new arg - mark returned.
    Disabled Lost Status on catalogue item edit.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    For follow up we need to explain how to hide the 952$1 (lost) from
    the framework by putting it in the 'ignore' tab.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:03:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:03:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-723-g4770555
Message-ID: <E1RFtPV-0008DF-Os@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  4770555855930e45eeaedd1e25a9a39af0861604 (commit)
      from  41928b088075a5da9bffb19edf906e94aa84466f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Accounts.pm                             |   77 ++++++++-------------------
 C4/Circulation.pm                          |   40 ++++++++++++++-
 C4/Items.pm                                |    8 +++-
 catalogue/updateitem.pl                    |    3 +-
 cataloguing/additem.pl                     |   37 ++++++++-----
 misc/cronjobs/longoverdue.pl               |    3 +-
 t/db_dependent/lib/KohaTest/Accounts.pm    |    1 -
 t/db_dependent/lib/KohaTest/Circulation.pm |    1 +
 tools/batchMod.pl                          |    7 ++-
 9 files changed, 99 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:09:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:09:51 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7044
	created. v3.04.00-724-g5938eb3
Message-ID: <E1RFtVP-0008FE-FW@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7044 has been created
        at  5938eb306acc2668b00178d88f319ad18c93e775 (commit)

- Log -----------------------------------------------------------------
commit 5938eb306acc2668b00178d88f319ad18c93e775
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 14 22:39:56 2011 -0400

    Bug 7044 OPAC Branch Selector Fix
    
    There was a typo in the OPAC branch selector added by
    the OpacAddMastheadLibraryPulldown preference where the
    current branch wasn't selected. This patch fixes that typo.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:12:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:12:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-724-g5938eb3
Message-ID: <E1RFtYH-0008GB-Uk@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  5938eb306acc2668b00178d88f319ad18c93e775 (commit)
      from  4770555855930e45eeaedd1e25a9a39af0861604 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:24:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:24:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6390
	created. v3.04.00-725-g0fe43ac
Message-ID: <E1RFtje-0008Im-6k@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6390 has been created
        at  0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2 (commit)

- Log -----------------------------------------------------------------
commit 0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Aug 5 10:13:20 2011 +0200

    Bug 6390: Implement 'see mine/my branches/all baskets'-syspref
    
    Code written by Edgar Fu? <ef at math.uni-bonn.de>,
    Mathematisches Institut der Uniersit?t Bonn
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - rebased on current master, fixed a conflict in booksellers.pl
    - reworked permission checks to account for general acq permissions and
      superlibrarian permission
    - rephrased text of system preference (Thx to Jared Camins-Esakov)
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:39:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:39:30 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6390
	updated. v3.04.00-726-gbc33391
Message-ID: <E1RFty6-0008Mk-JC@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6390 has been updated
       via  bc33391fc5491e0acbc9431d3a6b24c4f357ff79 (commit)
      from  0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bc33391fc5491e0acbc9431d3a6b24c4f357ff79
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Tue Sep 6 15:03:09 2011 -0400

    Follow up for Bug 6390: Add upatedatabase.pl
    
    This patch updated the language of the preference and added to
    updatedatabase.pl which was missing in the last patch.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Oct 17 22:47:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Oct 2011 20:47:16 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-729-g1ffdbfa
Message-ID: <E1RFu5c-0008Pj-2a@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2 (commit)
       via  f2794f79342e48bc433f0d56ea8baf5ef0bba526 (commit)
       via  8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96 (commit)
       via  bc33391fc5491e0acbc9431d3a6b24c4f357ff79 (commit)
       via  0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2 (commit)
      from  5938eb306acc2668b00178d88f319ad18c93e775 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 18 09:46:45 2011 +1300

    Bumping database version

commit f2794f79342e48bc433f0d56ea8baf5ef0bba526
Merge: 8f75c19 bc33391
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Oct 18 09:45:39 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster

commit 8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Aug 5 10:13:20 2011 +0200

    Bug 6390: Implement 'see mine/my branches/all baskets'-syspref
    
    Code written by Edgar Fu? <ef at math.uni-bonn.de>,
    Mathematisches Institut der Uniersit?t Bonn
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - rebased on current master, fixed a conflict in booksellers.pl
    - reworked permission checks to account for general acq permissions and
      superlibrarian permission
    - rephrased text of system preference (Thx to Jared Camins-Esakov)
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 acqui/booksellers.pl                               |   28 ++++++++++++++-----
 admin/systempreferences.pl                         |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    7 +++++
 .../en/modules/admin/preferences/acquisitions.pref |    7 +++++
 kohaversion.pl                                     |    2 +-
 6 files changed, 37 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 04:55:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 02:55:40 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6983
	created. v3.04.00-730-g15e846d
Message-ID: <E1RFzq8-0001WI-8v@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6983 has been created
        at  15e846d74aa30d3bfa5222d009171313594590d7 (commit)

- Log -----------------------------------------------------------------
commit 15e846d74aa30d3bfa5222d009171313594590d7
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 6 15:13:30 2011 -0400

    Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
    
    This patch adds a check for the item-level_itypes preference
    when building the SQL for the overdues report.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 04:56:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 02:56:00 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-730-g15e846d
Message-ID: <E1RFzqS-0001X4-Ce@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  15e846d74aa30d3bfa5222d009171313594590d7 (commit)
      from  1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/overdue.pl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 04:58:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 02:58:37 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7022
	created. v3.04.00-731-gf9fdf43
Message-ID: <E1RFzsz-0001Xs-3Q@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7022 has been created
        at  f9fdf43043d78e60b5ff5a16773b7f8662da79fd (commit)

- Log -----------------------------------------------------------------
commit f9fdf43043d78e60b5ff5a16773b7f8662da79fd
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Oct 13 22:21:52 2011 +0200

    Bug 7022: Move sample_notices* sql files from optional to mandatory
    
    Sending messages  will not work correctly without correct data in sample_notice_message_transports
    and sample_notice_message_attributes tables. There is no way to configure those tables in Koha.
    SQL files should be in the mandatory part of the web installer.
    
    Signed-off-by: MJ Ray <mjr at phonecoop.coop>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 04:58:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 02:58:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-731-gf9fdf43
Message-ID: <E1RFztF-0001Ye-Bf@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f9fdf43043d78e60b5ff5a16773b7f8662da79fd (commit)
      from  15e846d74aa30d3bfa5222d009171313594590d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 32 files changed, 0 insertions(+), 0 deletions(-)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_transports.txt (100%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:02:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:02:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7038
	created. v3.04.00-732-gef5d4d7
Message-ID: <E1RFzwN-0001aP-3D@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7038 has been created
        at  ef5d4d7bf8caf84c917fdbcd22005767b6f9e960 (commit)

- Log -----------------------------------------------------------------
commit ef5d4d7bf8caf84c917fdbcd22005767b6f9e960
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sun Oct 16 21:50:24 2011 +0200

    Bug 7038 Contextual help is always in English
    
    When another language than English is selected in pro interface, the software
    strings are in this language, but when clicking ?, on the top right of any
    page, the contextual help page which pop-up is always in English.
    
    This patch fixes this bug and another side bug affecting editing contextual
    help when not in English. help.pl script were in sync with the recently
    patched/improved theme/language/template selection.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Context help now matches the selected template language.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:03:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:03:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-732-gef5d4d7
Message-ID: <E1RFzxa-0001bC-LH@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  ef5d4d7bf8caf84c917fdbcd22005767b6f9e960 (commit)
      from  f9fdf43043d78e60b5ff5a16773b7f8662da79fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 edithelp.pl |   10 ++++------
 help.pl     |   12 +++---------
 2 files changed, 7 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:07:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:07:10 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7043
	created. v3.04.00-733-g72f8269
Message-ID: <E1RG01G-0001cP-Tg@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7043 has been created
        at  72f826963c20dfdc6c5934693089e3d3e83ec1ec (commit)

- Log -----------------------------------------------------------------
commit 72f826963c20dfdc6c5934693089e3d3e83ec1ec
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 17 11:51:16 2011 -0400

    Fix for Bug 7043 - masthead_search id used twice in template
    
    Changing ID of library selector, and moving inline styles to
    the CSS as requested by kf in the bug comments.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:07:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:07:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-733-g72f8269
Message-ID: <E1RG01w-0001dB-Ni@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  72f826963c20dfdc6c5934693089e3d3e83ec1ec (commit)
      from  ef5d4d7bf8caf84c917fdbcd22005767b6f9e960 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/css/opac.css          |    6 ++++++
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:13:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:13:24 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6954
	created. v3.04.00-734-gf38e1e7
Message-ID: <E1RG07I-0001eu-I2@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6954 has been created
        at  f38e1e7a0e92e1680e00667fb898be14221a2319 (commit)

- Log -----------------------------------------------------------------
commit f38e1e7a0e92e1680e00667fb898be14221a2319
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 4 12:46:24 2011 -0400

    Bug 6954: z39.50 results highlighting not sticking
    
    Moves the highlighting call of the JS up to right after 'row' is defined, so the
    highlighting will stick even after you click on of the popup menu options
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 05:14:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 03:14:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-734-gf38e1e7
Message-ID: <E1RG07y-0001fg-Bc@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f38e1e7a0e92e1680e00667fb898be14221a2319 (commit)
      from  72f826963c20dfdc6c5934693089e3d3e83ec1ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/cataloguing/z3950_search.tt    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 15:57:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 13:57:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-735-g5faaa7f
Message-ID: <E1RGAAv-0003oC-Ma@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  5faaa7f13a17d29197b1bced3bd86731d61ee0d7 (commit)
      from  f38e1e7a0e92e1680e00667fb898be14221a2319 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5faaa7f13a17d29197b1bced3bd86731d61ee0d7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 19 02:57:18 2011 +1300

    Updating perl version required to match reality

-----------------------------------------------------------------------

Summary of changes:
 INSTALL     |    2 +-
 Makefile.PL |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:09:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:09:31 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6949
	created. v3.04.00-736-g9c84f38
Message-ID: <E1RGAMF-0003x0-9m@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6949 has been created
        at  9c84f38b3496f32037a97b441aab21e8c2647250 (commit)

- Log -----------------------------------------------------------------
commit 9c84f38b3496f32037a97b441aab21e8c2647250
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Oct 13 10:11:46 2011 -0400

    Bug 6949: cannot remove owner from fund
    
    The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
    the actual value in the form, so when saving, the original owner was retained.
    
    This patch adds the command to set the value to ''.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I could reproduce the bug on current master. Patch fixes the problem, fund
    owners can now be added and removed without any problems.
    Thx for providing a test plan!
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:09:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:09:49 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-736-g9c84f38
Message-ID: <E1RGAMX-0003xl-Nf@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  9c84f38b3496f32037a97b441aab21e8c2647250 (commit)
      from  5faaa7f13a17d29197b1bced3bd86731d61ee0d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/admin/aqbudgets.tt             |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:24:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:24:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7034
	created. v3.04.00-737-g69732f5
Message-ID: <E1RGAaK-00041L-SG@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7034 has been created
        at  69732f5c62337a97269d8b0b09343805a970c6fa (commit)

- Log -----------------------------------------------------------------
commit 69732f5c62337a97269d8b0b09343805a970c6fa
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 16 18:09:57 2011 +0200

    Bug 7034: de-nesting C4/Branch.pm
    
    use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
    
    the sub get_branchinfos_of was used nowhere
    (checked with "grep -R get_branchinfos_of *")
    only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
    
    This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
    
    The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:26:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:26:10 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7035
	created. v3.04.00-738-g94b067b
Message-ID: <E1RGAcM-00042a-2U@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7035 has been created
        at  94b067b53c566c320478eb074e4250ed9c86b51d (commit)

- Log -----------------------------------------------------------------
commit 94b067b53c566c320478eb074e4250ed9c86b51d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 16 19:29:47 2011 +0200

    Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine
    
    just removing use C4::Koha, that are useless
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:44:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:44:51 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7036
	created. v3.04.00-739-g30708e4
Message-ID: <E1RGAuR-000467-07@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7036 has been created
        at  30708e4ebdb7c54cb8c32ee10682d2203bbab2bd (commit)

- Log -----------------------------------------------------------------
commit 30708e4ebdb7c54cb8c32ee10682d2203bbab2bd
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:30:44 2011 +0200

    Bug 7036 de-nesting C4::Circulation
    
    Just removing use C4::Koha, as other packages are widely used.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 16:50:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 14:50:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7037
	created. v3.04.00-740-g86e9c29
Message-ID: <E1RGAzU-00048H-L1@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7037 has been created
        at  86e9c29f54e16a276889b10c1245ad1588147e35 (commit)

- Log -----------------------------------------------------------------
commit 86e9c29f54e16a276889b10c1245ad1588147e35
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:31:10 2011 +0200

    Bug 7037 de-nesting C4/Print.pm
    
    removing use C4::Circulation, that is useless
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 56b9412562599d1decabb27e7d4f562ec63c005a
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:30:44 2011 +0200

    Bug 7036 de-nesting C4::Circulation
    
    Just removing use C4::Koha, as other packages are widely used.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 17:06:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 15:06:32 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7051
	created. v3.04.00-741-g7631bae
Message-ID: <E1RGBFQ-0004Cz-Lb@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7051 has been created
        at  7631bae2b2e5f6f2f71ddc4fe841816cd4688047 (commit)

- Log -----------------------------------------------------------------
commit 7631bae2b2e5f6f2f71ddc4fe841816cd4688047
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:32:54 2011 +0200

    Bug 7051 de-nesting C4::Reserve, 1st step
    
    C4::Search is not used, so removing it from C4::Reserves
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Oct 18 17:06:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Oct 2011 15:06:57 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-741-g7631bae
Message-ID: <E1RGBFo-0004Dl-UU@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  7631bae2b2e5f6f2f71ddc4fe841816cd4688047 (commit)
       via  86e9c29f54e16a276889b10c1245ad1588147e35 (commit)
       via  56b9412562599d1decabb27e7d4f562ec63c005a (commit)
       via  94b067b53c566c320478eb074e4250ed9c86b51d (commit)
       via  69732f5c62337a97269d8b0b09343805a970c6fa (commit)
      from  9c84f38b3496f32037a97b441aab21e8c2647250 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Branch.pm                          |   29 -----------------------------
 C4/Circulation.pm                     |    1 -
 C4/ClassSortRoutine.pm                |    1 -
 C4/ClassSource.pm                     |    1 -
 C4/Print.pm                           |    1 -
 C4/Reserves.pm                        |    1 -
 reserve/request.pl                    |    2 +-
 t/db_dependent/lib/KohaTest/Branch.pm |    1 -
 8 files changed, 1 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 04:47:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 02:47:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7026
	created. v3.04.00-742-g1bf7550
Message-ID: <E1RGMBq-0006ys-Ag@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7026 has been created
        at  1bf7550a82e7fc8b1c608fde3ff236af65b83dfc (commit)

- Log -----------------------------------------------------------------
commit 1bf7550a82e7fc8b1c608fde3ff236af65b83dfc
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Oct 17 08:03:29 2011 +0200

    Bug 7026 Web installer does not switch language
    
    Language installer should switch to template files of language selected in
    first step. It used to do that, but the feature seems to be broken now. Web
    installer remains English after selecting a different language.
    
    To reproduce:
    
    - make sure your database is empty
    - run 'perl translate install <some language>
    - access web installer
    - select language other then en on the first page
    
    => templates should change to translated templates
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Test plan provided works, correct language and sample files are selected.
    
    In a second test I deleted the staff templates for de-DE and repeated
    the steps. de-DE is not offered in the language selection of the web installer
    now, but does appear in the opaclanguages list after running the web installer.
    (Bug 5660)
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 04:47:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 02:47:48 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-742-g1bf7550
Message-ID: <E1RGMC4-0006zf-J3@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  1bf7550a82e7fc8b1c608fde3ff236af65b83dfc (commit)
      from  7631bae2b2e5f6f2f71ddc4fe841816cd4688047 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 installer/InstallAuth.pm |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 04:50:17 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 02:50:17 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7007
	created. v3.04.00-743-gfb3272f
Message-ID: <E1RGMET-000710-9c@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7007 has been created
        at  fb3272febd08e2e570931f1a0eba4c3dbacc89b2 (commit)

- Log -----------------------------------------------------------------
commit fb3272febd08e2e570931f1a0eba4c3dbacc89b2
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Tue Oct 11 15:21:04 2011 -0400

    Bug 7007: 490 series statements should appear when not traced
    
    Although the MARC21 standard requires libraries to set the first indicator to
    '0' when a 490 field is untraced, many libraries leave it blank. Previously,
    this resulted in a blank line with the label "Series:" but no actual series
    information. This patch fixes that by showing untraced series headings for
    490s whenever the first indicator is not set to '1'
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Checked that series shows correctly when first indicator is 0, 1 or not set.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 04:50:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 02:50:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-743-gfb3272f
Message-ID: <E1RGMF4-00071m-6I@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  fb3272febd08e2e570931f1a0eba4c3dbacc89b2 (commit)
      from  1bf7550a82e7fc8b1c608fde3ff236af65b83dfc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:23:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:23:45 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6253
	created. v3.04.00-744-g18b8991
Message-ID: <E1RGMkr-00077t-AB@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6253 has been created
        at  18b8991cf1832a0ee79a526e6438b51fdb4f3208 (commit)

- Log -----------------------------------------------------------------
commit 18b8991cf1832a0ee79a526e6438b51fdb4f3208
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Sep 22 09:43:12 2011 -0500

    bug_6253: Unified member Search()
    
    Removed SearchMembers() and replaced with more generic Search()
    Amended Search() to try cardnumber first
    Replaced SearchMembers() calls with Search()
    Replaced SELECT with Search() where appropriate
    C4::SQLHelper:
    - added support for '' key for search filter.
    - when passing an array to filter, join with OR (rather than AND)
    - added support for key => [val1, val2] in filter
    - did not document - there was no input documentation to start with,
      and SQLHelper should be replaced with something better anyway
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    (again - testing merge issue)
    The functionality of the patch seems to be maintained with Biblibre's changes.
    
    I tested the following:
    Extended attribute searching: works
    3 part name searching: works
    2 part name searching: works
    1 part name searching: works
    
    From:
    mainpage.pl
    members-home.pl
    	Patron search limited by branch: Works
    	Patron search limited by patron category: works
    	Ordering by cardnumber instead of surname: works
    The "Check Out" field in the masthead.
    
    Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:24:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:24:07 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-744-g18b8991
Message-ID: <E1RGMlD-00078r-7H@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  18b8991cf1832a0ee79a526e6438b51fdb4f3208 (commit)
      from  fb3272febd08e2e570931f1a0eba4c3dbacc89b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Members.pm                          |  256 ++++++++++++++------------------
 C4/Members/Attributes.pm               |   13 +-
 C4/SQLHelper.pm                        |   77 ++++++++--
 admin/aqbudget_owner_search.pl         |    2 +-
 circ/circulation.pl                    |    2 +-
 circ/ysearch.pl                        |   29 +---
 members/guarantor_search.pl            |   11 +-
 members/member.pl                      |   19 +--
 patroncards/members-search.pl          |   14 +--
 reserve/request.pl                     |   22 ++--
 t/db_dependent/Koha.t                  |   14 ++-
 t/db_dependent/Members.t               |  181 +++++++++++++++++------
 t/db_dependent/lib/KohaTest/Members.pm |    2 +-
 13 files changed, 358 insertions(+), 284 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:27:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:27:43 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6929
	created. v3.04.00-745-gaca4149
Message-ID: <E1RGMoh-00079j-7c@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6929 has been created
        at  aca414977ac3f16cec353c23c59a298ee828d24c (commit)

- Log -----------------------------------------------------------------
commit aca414977ac3f16cec353c23c59a298ee828d24c
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 28 19:09:01 2011 +1300

    Bug 6929 - ensure that koha-stop-zebra will try to stop everything
    
    Currently, if it attempts to stop a zebra process that doesn't exist,
    the script will abort, which leaves things running. This patch prevents
    it from aborting.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:30:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:30:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-745-gaca4149
Message-ID: <E1RGMrG-0007Bj-7i@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  aca414977ac3f16cec353c23c59a298ee828d24c (commit)
      from  18b8991cf1832a0ee79a526e6438b51fdb4f3208 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/scripts/koha-stop-zebra |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:39:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:39:19 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6996
	created. v3.04.00-746-ga7d0255
Message-ID: <E1RGMzv-0007Du-Gv@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6996 has been created
        at  a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0 (commit)

- Log -----------------------------------------------------------------
commit a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Oct 12 14:43:53 2011 +0200

    Bug 6996: Encoding problem in opac-showmarc
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    No more encoding problems spotted.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:39:33 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:39:33 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-746-ga7d0255
Message-ID: <E1RGN09-0007Eg-NU@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0 (commit)
      from  aca414977ac3f16cec353c23c59a298ee828d24c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 opac/opac-showmarc.pl |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:45:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:45:31 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5616
	updated. v3.02.00-643-g980d8fb
Message-ID: <E1RGN5u-0007H2-Vz@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5616 has been updated
       via  980d8fbed45b3d43341347e612b777b54fd12d10 (commit)
      from  07731037ee453fe3537c257b07be9c49b66e8ced (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 980d8fbed45b3d43341347e612b777b54fd12d10
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Oct 10 13:04:34 2011 +0200

    Bug 5616: UTF-8 problem in Card View / Follow up
    
    Decode data only if needed.
    Add instruction to use UTF8 in html header.
    Force utf8 on output handle.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Umlauts and other diacritics in card view of z39.50 search are now
    correctly displayed.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
      removed 2 commented lines
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 catalogue/showmarc.pl |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:46:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:46:20 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-748-g16f1fff
Message-ID: <E1RGN6i-0007Ht-Su@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  16f1fffdd1f5d1c97db0bf664f83496864b7e24d (commit)
       via  980d8fbed45b3d43341347e612b777b54fd12d10 (commit)
      from  a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 16f1fffdd1f5d1c97db0bf664f83496864b7e24d
Merge: a7d0255 980d8fb
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 19 16:45:41 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 catalogue/showmarc.pl |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:51:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:51:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6285
	created. v3.04.00-749-gf6043fb
Message-ID: <E1RGNBb-0007KF-6A@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6285 has been created
        at  f6043fbbe49eba279ee0635c43dd5a46a20eeb52 (commit)

- Log -----------------------------------------------------------------
commit f6043fbbe49eba279ee0635c43dd5a46a20eeb52
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Apr 29 19:31:40 2011 +0200

    Bug 6285 strange order in CSV upload
    
    uploading the circ overdues result in a csv with columns in a strange order
    and not the order of the screen
    This patch reorder the column by putting the usefull ones first
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:51:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:51:46 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-749-gf6043fb
Message-ID: <E1RGNBy-0007L1-4G@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  f6043fbbe49eba279ee0635c43dd5a46a20eeb52 (commit)
      from  16f1fffdd1f5d1c97db0bf664f83496864b7e24d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 circ/overdue.pl |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:54:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:54:22 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6982
	created. v3.04.00-750-gc7a2ef3
Message-ID: <E1RGNEU-0007Lz-6E@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6982 has been created
        at  c7a2ef33177f176b8c5a5c12da9586de77569af1 (commit)

- Log -----------------------------------------------------------------
commit c7a2ef33177f176b8c5a5c12da9586de77569af1
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Fri Oct 7 13:38:15 2011 +0200

    Bug 6982 - Don't show MARC tag documentation links for NORMARC
    
    Links to UNIMARC documentation were being shown when marcflavour =
    NORMARC. This patch hides the doc link functionality for NORMARC
    by hiding:
    1. The checkbox for turning doc links on/off
    2. The hyperlinked questionmarks
    
    This patch does not hide e.g. the JavaScript functions related to
    the doc link functionality, in order to make it easy to add
    doc links for NORMARC in the future (hopefully).
    
    The doc link functionality was passing a variable called MARC21
    (based on the contents of the marcflavour syspref) to the
    template and testing the value of this to decide if MARC21 or
    UNIMARC doc links were to be shown. I have replaced this variable
    with he standard/full marcflavour syspref, in order to make it
    possible to test for more then two MARC dialects.
    
    To test:
    - Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
      after the other.
    - Check that correct doc links are shown for MARC21 and UNIMARC
      on the cataloguing screen, and that no checkbox and no doc links
      are displayed for NORMARC.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described - thx for the great test plan!
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 05:59:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 03:59:36 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5680
	created. v3.04.00-752-gdcfb5e6
Message-ID: <E1RGNJY-0007Ms-F0@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_5680 has been created
        at  dcfb5e63c9092efc396da98b51e079efc3b823f9 (commit)

- Log -----------------------------------------------------------------
commit dcfb5e63c9092efc396da98b51e079efc3b823f9
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Sat Oct 15 21:21:35 2011 +0200

    Bug 5680: Follow Up for Order cancelling improvement : the same for parcel.pl
    
    The same scope than in basket.pl
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Detailed information about possible deletion of orders on parcel page.
    
    1) Delete order for record with 1 other item and item level hold
    OK. Record, item and hold remain, only on order item is deleted.
    
    2) Delete order for ordered record with 1 item and title level hold
    OK. Deletion is not possible, before hold is cancelled.
    
    3) Delete order for new record with only items connected to this order
    OK. Cancelling the order deletes record and item or only order,
    depending on link used.
    
    4) Delete order for record with subscription.
    OK. Subscription remains untouched, item is deleted.
    
    Also checked:
    AcqCreateItem = on receive / in cataloging
    Links show and it's possible to delete the order or only the record
    using different links.
    
    Comments:
    There is a table sorter option for the last column with the delete links.
    I am not sure it is useful here, but it does work.
    
    Before patch is applied, the links use 'cancel' instead of 'delete'.
    I am not sure which is better and if it should be different on
    basket summary and order receive or the same on both.
    
    QA Comment:
    Made a small change to template language; blocking deletion because of items referred to
    holds instead.  Changed text to refer to items.
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 4d67e6910775ea389cfa0a25e3fb55b9cf17bd6f
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Tue May 24 16:39:42 2011 +0200

    Bug 5680: Order cancelling improvement : delete attached items & biblio if avalaible
    
    - all items attached to the order are deleted
    - if there is no more items, and if the biblio is not in other orders and no subscriptions and no holds then the biblio is proposed to deletion
    Now whe have 2 links : "delete order" and "delete order and catalog record", the second one appears only if the deletion is possible.
    Note that if an hold is related to the item or if the item is unique for the biblio the link "Delete order" is canceled due to hold remaining.
    On mouse over explanations are shown with count.
    More lines of warnings with count are shown depending of the case.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Configuration:
    AcqCreateItem = on order
    
    Test cases and results:
    
    1) Order new record with 2 items
    a) From basket
    - delete order: only deletes items, OK!
    - delete order and catalog record: deletes record and items, OK
    b) From shipment/receive
    - delete order: only deletes items, OK!
    
    2) Order 1 additional item for existing record with 1 item
    a) From basket:
    - delete order: works, existing item and record remain, OK
    - Can't delete order and catalog record, 1 item left, OK!
    
    3) Order new record with 1 item, title level hold on record
    a) From basket:
    - delete order: not possible, OK!
    - delete orer and catalog record: not possible, OK!
    b) From shipment/receive page
    - Cancel: Deletes order, record and hold silently.
    NO WARNING. NOT OK. See note below.
    
    4) Order 1 additional item for existing record with 1 item,
    item level hold on existing item
    a) From basket:
    - delete order: works, hold and existing item remain, OK!
    - delete order and catalog record: not possible, OK!
    b) From shipment/receive page
    - Cancel: on order item is deleted, other item and hold remain.
    
    5) Order new serial record, create subscription
    a) From basket:
    - delete order: works, record and subscription remain, OK!
    - delete order and catalog record: not possible, OK!
    b) From shipment/receive page:
    - Cancel: Subscription and record are silently deleted. NOT OK.
    
    6) Order additional item for existing record with other on order items
    a) From basket:
    - delete order: works, existing on order items remain, OK!
    - delete order and catalog record: not possible, OK!
    b) From shipment:
    - Cancel: deletes order and ordered item. OK.
    
    Changes made:
    I changed the wording of the error messages a bit in the template.
    I changed the message 'Can't delete order and catalog record' to not be
    shown as a link, as the link does nothing. Tooltip still appears.
    I attached a screenshot to the bug showing some of my changes.
    
    Hope that's ok.
    
    Necessary  enhancements:
    Cancelling orders when receiving items should work the same as from the
    basket summary page. We need the same checks and messages there before
    deleting records and items automatically.
    I am signing off on this, but to go into Koha it  needs a follow-up for the
    order receive page.
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 06:00:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 04:00:13 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-752-gdcfb5e6
Message-ID: <E1RGNK8-0007Nn-Ts@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  dcfb5e63c9092efc396da98b51e079efc3b823f9 (commit)
       via  4d67e6910775ea389cfa0a25e3fb55b9cf17bd6f (commit)
       via  c7a2ef33177f176b8c5a5c12da9586de77569af1 (commit)
      from  f6043fbbe49eba279ee0635c43dd5a46a20eeb52 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Acquisition.pm                                  |    5 ++
 C4/Biblio.pm                                       |   73 ++++++++++++++++++++
 C4/Items.pm                                        |   27 +++++++-
 acqui/addorder.pl                                  |    4 +
 acqui/basket.pl                                    |   43 +++++++++---
 acqui/parcel.pl                                    |   69 ++++++++----------
 cataloguing/addbiblio.pl                           |    8 +--
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   33 ++++++++-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   48 ++++++++++++-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   13 ++--
 10 files changed, 256 insertions(+), 67 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 06:04:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 04:04:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6883
	created. v3.04.00-753-gbafa960
Message-ID: <E1RGNOd-0007Pw-UC@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6883 has been created
        at  bafa96058f28b234e8a5fcc9b4d04a803d10c9e1 (commit)

- Log -----------------------------------------------------------------
commit bafa96058f28b234e8a5fcc9b4d04a803d10c9e1
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 19 07:25:17 2011 +0200

    Bug 6883 Update userpermisions.sql fr-FR file
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I verified that the new files works with the web installer, permissions
    can be set and removed.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 06:05:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 04:05:29 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-753-gbafa960
Message-ID: <E1RGNPF-0007Qi-Pe@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  bafa96058f28b234e8a5fcc9b4d04a803d10c9e1 (commit)
      from  dcfb5e63c9092efc396da98b51e079efc3b823f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |   24 ++++++++++----------
 1 files changed, 12 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 14:53:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 12:53:43 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6972
	created. v3.04.00-755-gd50de1f
Message-ID: <E1RGVeR-0000ZU-SI@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6972 has been created
        at  d50de1f040be4b6498cc054689f524fd7d13321f (commit)

- Log -----------------------------------------------------------------
commit d50de1f040be4b6498cc054689f524fd7d13321f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 01:52:52 2011 +1300

    Bug 6972 : Followup fixing bad indentation

commit 030fe0570f6ae2d0561756ee2168c1d3528af985
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Tue Oct 4 14:32:08 2011 -0400

    Bug 6972: Hardcoded template paths to en in showmarc
    
    Couldn't help but reformat the indentation a bit.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Card view works correctly in cataloguing search.
    Plain view/labelled show correctly in OPAC.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Fixing merge conflict.

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 14:54:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 12:54:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-755-gd50de1f
Message-ID: <E1RGVen-0000aX-WC@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d50de1f040be4b6498cc054689f524fd7d13321f (commit)
       via  030fe0570f6ae2d0561756ee2168c1d3528af985 (commit)
      from  bafa96058f28b234e8a5fcc9b4d04a803d10c9e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 catalogue/showmarc.pl |   48 ++++++++++++++++++++++++------------------------
 opac/opac-showmarc.pl |    9 +++++----
 2 files changed, 29 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 16:19:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 14:19:40 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_5436
	updated. v3.04.00-756-g8d39d21
Message-ID: <E1RGWzc-0000t8-5C@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_5436 has been updated
       via  8d39d21039d489444b7ed6fa06b03aa87d21f5bd (commit)
       via  d50de1f040be4b6498cc054689f524fd7d13321f (commit)
       via  030fe0570f6ae2d0561756ee2168c1d3528af985 (commit)
       via  bafa96058f28b234e8a5fcc9b4d04a803d10c9e1 (commit)
       via  dcfb5e63c9092efc396da98b51e079efc3b823f9 (commit)
       via  4d67e6910775ea389cfa0a25e3fb55b9cf17bd6f (commit)
       via  c7a2ef33177f176b8c5a5c12da9586de77569af1 (commit)
       via  f6043fbbe49eba279ee0635c43dd5a46a20eeb52 (commit)
       via  16f1fffdd1f5d1c97db0bf664f83496864b7e24d (commit)
       via  980d8fbed45b3d43341347e612b777b54fd12d10 (commit)
       via  a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0 (commit)
       via  aca414977ac3f16cec353c23c59a298ee828d24c (commit)
       via  18b8991cf1832a0ee79a526e6438b51fdb4f3208 (commit)
       via  fb3272febd08e2e570931f1a0eba4c3dbacc89b2 (commit)
       via  1bf7550a82e7fc8b1c608fde3ff236af65b83dfc (commit)
       via  7631bae2b2e5f6f2f71ddc4fe841816cd4688047 (commit)
       via  86e9c29f54e16a276889b10c1245ad1588147e35 (commit)
       via  56b9412562599d1decabb27e7d4f562ec63c005a (commit)
       via  94b067b53c566c320478eb074e4250ed9c86b51d (commit)
       via  69732f5c62337a97269d8b0b09343805a970c6fa (commit)
       via  9c84f38b3496f32037a97b441aab21e8c2647250 (commit)
       via  5faaa7f13a17d29197b1bced3bd86731d61ee0d7 (commit)
       via  f38e1e7a0e92e1680e00667fb898be14221a2319 (commit)
       via  72f826963c20dfdc6c5934693089e3d3e83ec1ec (commit)
       via  ef5d4d7bf8caf84c917fdbcd22005767b6f9e960 (commit)
       via  f9fdf43043d78e60b5ff5a16773b7f8662da79fd (commit)
       via  15e846d74aa30d3bfa5222d009171313594590d7 (commit)
       via  1ffdbfa5e9c3f4d63244f0897ac9b8f5eb1177d2 (commit)
       via  f2794f79342e48bc433f0d56ea8baf5ef0bba526 (commit)
       via  8f75c19afdcbb7e5f266fe21eb7bec4d24e56e96 (commit)
       via  bc33391fc5491e0acbc9431d3a6b24c4f357ff79 (commit)
       via  0fe43ac28b2a171ac07f82c38347e1b10a0a9fd2 (commit)
       via  5938eb306acc2668b00178d88f319ad18c93e775 (commit)
       via  4770555855930e45eeaedd1e25a9a39af0861604 (commit)
       via  41928b088075a5da9bffb19edf906e94aa84466f (commit)
       via  bfaf07b2780ed033677683ef40ce04e55d7c2b3d (commit)
       via  5affbfc9fd5b6e5974aa9e64d074235046359950 (commit)
       via  a43974029205fb830eef8989b8a5899d0561840d (commit)
       via  087bb15e7003cb1f5e271b5b88c1abb99f33c89c (commit)
       via  1576e3f410b3c4914d1b803953f64e32c20d3e74 (commit)
       via  e5e5e3155e4c4b3f51415d08a324f84142e91f3d (commit)
       via  d010412c66a9291d13676ed7a3fbdaaf1b269b59 (commit)
       via  4e95e94727b09b33d2f6c597bdd218a59dcc3681 (commit)
       via  a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7 (commit)
       via  dcb4ac77fbfd813cc0eb39e060b49a7b8d491016 (commit)
       via  d139d400b11e76f19ed208d4898d57f678acf9f4 (commit)
       via  f85c06d0c0330bc4512db8000b9898ac75fe7481 (commit)
       via  ebd03e31e2a1cf2c30b97f2af48e283212d7a49a (commit)
       via  b83c3896456a20ad3612e4f91e4b63fcaf3bfb02 (commit)
       via  d7cbdd3d0bcc4bf06f65ed1fec16d506fa8f217f (commit)
       via  6c9ab3678a9ab747eb9f5a89a4a6972a861fa9ca (commit)
       via  72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755 (commit)
       via  412666e52b4e8f7bc5ae70f2b2978b1bd088a885 (commit)
       via  31d748665a396582ad344249c3dfd394b6047f85 (commit)
       via  2f11d527a0749e86350d62055f289aaee9435848 (commit)
       via  518710878972a72b8d7b306af571b7c543267ddd (commit)
       via  37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d (commit)
       via  7621591ae697328798a44a95757352a147e33d72 (commit)
       via  cdd798ec3216c6019adccc40935e93736ce4dc3b (commit)
       via  b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d (commit)
       via  a4baa4df1843f1390f372d1569eb446171705742 (commit)
       via  7f6656aff84b2e9e47dd3317e8c72d69aaa8e433 (commit)
       via  f97726406697f7973d2f8118049acaac2f95a3ed (commit)
       via  1c0702c76e50173289a0ee340a9c5f190515d9c3 (commit)
       via  74c7c4e3a5d6a3ec20b525936c5ffe2f9b188744 (commit)
       via  046c996c2fa8150b8c6a037976c9c22826e04b8b (commit)
       via  d205c2795799821bfb560109b841eafac7b239b1 (commit)
       via  f09e2ca27ee89860dbdd0ca512735f37fbfaf8a6 (commit)
       via  71defcbc6c851f54da223c040aa5d95e0bd43b73 (commit)
       via  d2d42b47c86d7dd10ccb3f866b090f70cac0140c (commit)
       via  0435a1d2f50b9380bbb9eef43c8f6d8ad3404e18 (commit)
       via  e5ff85d5562330dbd34410249ad04f4a478a0a04 (commit)
       via  fd052de5e179a26f9fec32141cc6d0f07b31ad9d (commit)
       via  1064c61a6947da4ba46bd0fbc81cd1e3e7de31b7 (commit)
       via  c42e0084bd4a29f383c7a23724c8255da70ba836 (commit)
       via  4216b980f3580eeec5af60ef030ac39277e587eb (commit)
       via  2ac26883157b95d2e5df75a3d3e26463cf6f887d (commit)
       via  e5c6fc8a87468d861022f57b3a86ddd76d5e493f (commit)
       via  0cf8194d5f6d1a401eb78abad88476ef061928c5 (commit)
       via  d03148a7176005f7f7bf46206b04f46fcd296acf (commit)
       via  85b1d6d55839017e75beede2f9829d4f4ba9e7ee (commit)
       via  de728937a874620e4015bc400dc496e6f53ed5a5 (commit)
       via  78e0754bfc17805d050074d116a3fa0e79546afd (commit)
       via  8b65b94636398729e5d919ca2eb6334e8013bdae (commit)
       via  ed73fb53ca6b402a240eb7d2ed414507fcc44290 (commit)
       via  7d8c805ef44310677065467fc57cf95baedad7c2 (commit)
       via  e05d53d50d84e28769cdd6e4a474245ea2ee34f0 (commit)
       via  f7387f27daa110c9165a5d69024bd5b4fad0757e (commit)
       via  7d599afe6d044db30f4ba7c233fce774dd8020d2 (commit)
       via  433d70d3ebb10f2ef1eda2e3a208c0abb9596e0e (commit)
       via  84a13ac022e5e49430b0533b5bcc5e8b6b25e0da (commit)
       via  4ab2ab51f5394c4dcc61da89bd77c03a8b557631 (commit)
       via  a22ae10491cb6b8ef72abf3544bd5b5f7b1ddcaf (commit)
       via  4b29162ddf044707e6f9b42e3de0c259d911cef8 (commit)
       via  4cc50cc3b4e594b04764650e44edf4bd2e5fab04 (commit)
       via  549ca98de98741e9fbfa8f5ecf51ba7d41b997c4 (commit)
       via  be0e2efc1099a6bb876a6acddf9406f6702ea3cc (commit)
       via  c44892d3180c52eb38f441088cd1cf7e84798846 (commit)
       via  6780d5d03d8eaa456ca7d4649622327f7a739761 (commit)
       via  f5121f851af64430d390520cbb4c931186933063 (commit)
       via  4f9faf4509eb4d98ca5931dc640fd0ad1b843eb6 (commit)
       via  b143ed1054f0b429cf832c4797c3af108cdd41d7 (commit)
       via  f33518e61e4f28be8d8f1a066ac49123352637a9 (commit)
       via  86d9496c269a95ec1a478c15b401da28db54fc10 (commit)
       via  ab55e630a87c3d291f638f0522c418b1f0507dbc (commit)
       via  0f6e7d5eb4cbe1f509aa8b719a4f583fce5bb8db (commit)
       via  d97ae8830ee7ee5ab42a8052b7c3c5b4f22d840d (commit)
       via  70b17c022ed0c6fbdea63e2f2b2f7f2caf0645c7 (commit)
       via  4e65e26baba26bc154dbd41e202cff8f101b9e8c (commit)
       via  72f98b94d6aa253a0edfcf87a9968e0ebea39ffa (commit)
       via  f56dc797546fd9f3037e974ab6f40cb603b33e74 (commit)
       via  77d69d1bebbe1b20fd35b39e4be1afda2a899b8a (commit)
       via  cfe8b6bd9a4f1921cb728d784083300344bcf2b1 (commit)
       via  cd1fbb7510c8d931cf0658d62ff66bdfbb079ef1 (commit)
       via  293a9baba8b95bb7bb60c0a3d7ba3ce33c16c01d (commit)
       via  f02796d989a377266a844e5b498945372a2a254f (commit)
       via  c7b77c789ee17515931e9d54a23d85234ed9e505 (commit)
       via  6ade95d5db2f2b6a0a2d47d53aecae26a9997243 (commit)
       via  1e16c7cbabf1b53be061d661dc02b27d4f271a3c (commit)
       via  0d0b3ef9c2840633ae9860b66babeba3cb453b1b (commit)
       via  1f0e3d7a4ba5265e586c0f940c46a63d04ab1e3f (commit)
       via  b5a3f485ab861b1d0330d1c4a3c4d17ba97f4863 (commit)
       via  4c1ea37e6366fc7a17ece602f73de4d7ebfbd279 (commit)
       via  873091dcc84de8856a1da936ab0045351273cc53 (commit)
       via  d388acd4825c7befb98438315a6ff8acd21cbbd9 (commit)
       via  38f4c5264dee725505e34f81756e68d2558c59f2 (commit)
       via  b1e6aadf56fa8036eb9dc9e55b4bb6a50e5d26a8 (commit)
       via  1d89ab22c973311939c3664ebb886ede713c0df2 (commit)
       via  481f620455d40f93a3cb37136ef2c3964497751e (commit)
       via  37c48ccfb2b0893366676741a506e0243db49d40 (commit)
       via  a291cc52ca79ed11e0032e73b380b17f3bf308cb (commit)
       via  973371a68b1c2a8af7d90afab8db15bda567f606 (commit)
       via  405ee6844d835322621bad4cfcfa8c359e8878f7 (commit)
       via  ed328807c37c452bc700295e823170721905053c (commit)
       via  69dad7258b08669e9d0a8110f05d7a5ef31b4196 (commit)
       via  085de44ebdc5bf6431c59b3e60af0277891cd19d (commit)
       via  5d5c4a67ec5c91770583edb38ce0213dfa6119c7 (commit)
       via  b9808b86dfb8363406bc1ffe46f9a663e1813327 (commit)
       via  26acaf3dfa24598f9cce1d647079f779e714f874 (commit)
       via  d5a886201cd5e2f7615b92ad727ba136eb105bab (commit)
       via  c9905750e53e2e1615842ac696d5eeb0a8ac07fc (commit)
       via  944831555e89c8fdb4dc865764de51887a98a23b (commit)
       via  05d9510ca91016a78db38cf7bec0bb4a2ea46480 (commit)
       via  cac6eb12502f82ed5a0b59a74cf84fa009ba0a26 (commit)
       via  c01fcbf97306d6fdcea001dbceaa4dc79c63239a (commit)
       via  05be38d438c242496a5c205fffefcfbdfdb63d46 (commit)
       via  166f1668d83974f9728728d269136095395f5200 (commit)
       via  c5fe424c0f826a16caf3674b66df638d18bc6449 (commit)
       via  3bb33fd666d4d0eea26114b373874189edc82459 (commit)
       via  592bced8edfb6b71f1f19cd658910ccad6536ce9 (commit)
       via  0d480bbf5cd7c392c1937fe29c7f7bd4e5fe3fc8 (commit)
       via  7244d5060be46f0b7154b897d28997970774957d (commit)
       via  8b75f5b38c00609299d7b6ed14bb5a08540f2675 (commit)
       via  f640a3ea5fdd85695ff7a75240c830369b5aed73 (commit)
       via  e9673ea4961636f57962e8934941948c10bdb8e6 (commit)
       via  5e0f0f487af6a88b4a3814df442e4b6df69aa4fb (commit)
       via  62b76aa98c4f30ae32cb76ba0348e94d31e8464f (commit)
       via  9f688ab5bc84b3522002929c5f65f37581ec1749 (commit)
       via  38ca8d6de18e630751dcae313d66f8546934fb5c (commit)
       via  04b413623b3e4f10cfe74a054367082ffe5d3e99 (commit)
       via  5ecbdcab931117733f68f2ae4fc8c3aeda8653a0 (commit)
       via  f297a3ecd295fe43ad4d167fad949e12e9491571 (commit)
       via  3c0883fac72368814e527325fc4e42d59f1339fc (commit)
       via  0920d96767f1e366670e87b5d4275c5473595d52 (commit)
       via  6b9fff61fb7e96902c8d6afac906285bc1f4bb80 (commit)
       via  a746e11c1462df4567c007c8e73cf14a55af5ddb (commit)
      from  061f2e9251bcfbb90b2babf3dee8a725b1295ba8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8d39d21039d489444b7ed6fa06b03aa87d21f5bd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 03:19:02 2011 +1300

    Bug 5436, adding updatedatabase.pl

-----------------------------------------------------------------------

Summary of changes:
 C4/Accounts.pm                                     |   77 +-
 C4/Acquisition.pm                                  |   13 +
 C4/Auth.pm                                         |  131 +-
 C4/Auth_cas_servers.yaml.orig                      |   12 +
 C4/Auth_with_cas.pm                                |  181 +-
 C4/Auth_with_ldap.pm                               |    4 +-
 C4/Biblio.pm                                       |  204 +-
 C4/Branch.pm                                       |   29 -
 C4/Circulation.pm                                  |   51 +-
 C4/ClassSortRoutine.pm                             |    1 -
 C4/ClassSource.pm                                  |    1 -
 C4/ItemType.pm                                     |   15 +-
 C4/Items.pm                                        |  207 +-
 C4/Languages.pm                                    |    1 -
 C4/Log.pm                                          |    3 +-
 C4/Members.pm                                      |  268 +-
 C4/Members/Attributes.pm                           |   13 +-
 C4/Overdues.pm                                     |   31 +-
 C4/Print.pm                                        |    1 -
 C4/Reports/Guided.pm                               |    4 +-
 C4/Reserves.pm                                     |   58 +-
 C4/Ris.pm                                          |  182 +-
 C4/SQLHelper.pm                                    |   77 +-
 C4/Search.pm                                       |   41 +-
 C4/Templates.pm                                    |  177 +-
 INSTALL                                            |    2 +-
 Makefile.PL                                        |    2 +-
 acqui/addorder.pl                                  |    4 +
 acqui/addorderiso2709.pl                           |   28 +-
 acqui/basket.pl                                    |   81 +-
 acqui/basketgroup.pl                               |   11 +-
 acqui/booksellers.pl                               |   28 +-
 acqui/histsearch.pl                                |    5 +-
 acqui/parcel.pl                                    |   69 +-
 admin/aqbudget_owner_search.pl                     |    2 +-
 admin/categorie.pl                                 |    1 +
 admin/systempreferences.pl                         |    1 +
 authorities/blinddetail-biblio-search.pl           |   21 +-
 catalogue/detail.pl                                |   42 +-
 catalogue/moredetail.pl                            |   18 +
 catalogue/search.pl                                |    2 +-
 catalogue/showmarc.pl                              |   51 +-
 catalogue/updateitem.pl                            |    3 +-
 cataloguing/addbiblio.pl                           |   31 +-
 cataloguing/additem.pl                             |   94 +-
 cataloguing/linkitem.pl                            |   98 +
 cataloguing/merge.pl                               |    5 +
 cataloguing/value_builder/unimarc_field_100.pl     |   18 +-
 cataloguing/value_builder/unimarc_field_105.pl     |   37 +-
 cataloguing/value_builder/unimarc_field_110.pl     |   24 +-
 cataloguing/value_builder/unimarc_field_115a.pl    |   41 +-
 cataloguing/value_builder/unimarc_field_115b.pl    |   25 +-
 cataloguing/value_builder/unimarc_field_116.pl     |   31 +-
 cataloguing/value_builder/unimarc_field_117.pl     |   20 +-
 cataloguing/value_builder/unimarc_field_120.pl     |   21 +-
 cataloguing/value_builder/unimarc_field_121a.pl    |   12 +-
 cataloguing/value_builder/unimarc_field_125b.pl    |   10 +-
 cataloguing/value_builder/unimarc_field_126a.pl    |   20 +-
 cataloguing/value_builder/unimarc_field_128b.pl    |    9 +-
 cataloguing/value_builder/unimarc_field_130.pl     |   10 +-
 cataloguing/value_builder/unimarc_field_135a.pl    |   10 +-
 cataloguing/value_builder/unimarc_field_140.pl     |   43 +-
 cataloguing/value_builder/unimarc_leader.pl        |   19 +-
 circ/circulation.pl                                |   10 +-
 circ/overdue.pl                                    |   11 +-
 circ/returns.pl                                    |    3 +
 circ/ysearch.pl                                    |   28 +-
 debian/scripts/koha-stop-zebra                     |    2 +-
 docs/CAS/CAS/README                                |    8 +
 docs/CAS/CASProxy/README                           |    9 +
 docs/CAS/CASProxy/examples/casSession.tmp          |  Bin 0 -> 134 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl      |   58 +
 docs/CAS/CASProxy/examples/proxy_cas.pl            |   91 +
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl   |   62 +
 docs/CAS/CASProxy/examples/proxy_cas_data.pl       |   80 +
 docs/history.txt                                   |   36 +-
 edithelp.pl                                        |   42 +-
 etc/zebradb/biblios/etc/bib1.att                   |    2 +-
 etc/zebradb/ccl.properties                         |    5 +-
 etc/zebradb/marc_defs/marc21/biblios/record.abs    |    5 +-
 etc/zebradb/marc_defs/unimarc/biblios/record.abs   |    3 +
 help.pl                                            |   16 +-
 installer/InstallAuth.pm                           |    8 +-
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    2 +
 .../optional/marc21_simple_bib_frameworks.sql      |   16 +
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../mysql/fr-FR/1-Obligatoire/userpermissions.sql  |   24 +-
 installer/data/mysql/kohastructure.sql             |    2 +-
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 installer/data/mysql/sysprefs.sql                  |   10 +
 .../sample_notices_message_attributes.sql          |    0
 .../sample_notices_message_attributes.txt          |    0
 .../sample_notices_message_transports.sql          |    0
 .../sample_notices_message_transports.txt          |    0
 installer/data/mysql/updatedatabase.pl             |   85 +-
 installer/install.pl                               |    3 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   41 +
 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css    |    4 +
 .../prog/en/includes/biblio-view-menu.inc          |    1 +
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |    2 +
 .../prog/en/includes/guided-reports-view.inc       |    5 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    4 +-
 .../prog/en/includes/patron-search.inc             |   10 +
 .../intranet-tmpl/prog/en/includes/table-pager.inc |   17 +
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |   15 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    4 +
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    7 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   33 +-
 .../prog/en/modules/acqui/histsearch.tt            |    3 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   48 +-
 .../prog/en/modules/admin/aqbudgets.tt             |    1 +
 .../prog/en/modules/admin/auth_tag_structure.tt    |   21 +-
 .../prog/en/modules/admin/authorised_values.tt     |   22 +-
 .../en/modules/admin/branch_transfer_limits.tt     |   34 +-
 .../prog/en/modules/admin/branches.tt              |   21 +-
 .../prog/en/modules/admin/categorie.tt             |   21 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |   21 +-
 .../prog/en/modules/admin/itemtypes.tt             |   21 +-
 .../prog/en/modules/admin/marctagstructure.tt      |   21 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |    6 +-
 .../en/modules/admin/preferences/acquisitions.pref |    7 +
 .../en/modules/admin/preferences/cataloguing.pref  |    6 +
 .../en/modules/admin/preferences/circulation.pref  |    7 +
 .../admin/preferences/enhanced_content.pref        |   23 +
 .../prog/en/modules/admin/preferences/opac.pref    |   12 +
 .../authorities/blinddetail-biblio-search.tt       |   79 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 .../prog/en/modules/basket/sendbasket.tt           |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |   26 +-
 .../prog/en/modules/catalogue/results.tt           |   22 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   15 +-
 .../prog/en/modules/cataloguing/additem.tt         |    7 +-
 .../prog/en/modules/cataloguing/linkitem.tt        |   57 +
 .../cataloguing/value_builder/normarc_field_007.tt |    2 +-
 .../cataloguing/value_builder/unimarc_field_100.tt |   10 +-
 .../cataloguing/value_builder/unimarc_field_105.tt |   18 +-
 .../cataloguing/value_builder/unimarc_field_110.tt |    2 +-
 .../value_builder/unimarc_field_115a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_116.tt |   54 +-
 .../cataloguing/value_builder/unimarc_field_117.tt |   30 +-
 .../cataloguing/value_builder/unimarc_field_120.tt |   14 +-
 .../value_builder/unimarc_field_121a.tt            |    4 +-
 .../value_builder/unimarc_field_125b.tt            |    2 +-
 .../value_builder/unimarc_field_126a.tt            |   14 +-
 .../value_builder/unimarc_field_128b.tt            |    6 +-
 .../cataloguing/value_builder/unimarc_field_130.tt |    2 +-
 .../value_builder/unimarc_field_135a.tt            |    2 +-
 .../cataloguing/value_builder/unimarc_field_140.tt |   34 +-
 .../cataloguing/value_builder/unimarc_leader.tt    |    6 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   19 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    5 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 +
 .../intranet-tmpl/prog/en/modules/help/about.tt    |    2 +
 .../prog/en/modules/help/acqui/acqcontract.tt      |    2 +
 .../prog/en/modules/help/acqui/basket.tt           |    2 +
 .../prog/en/modules/help/acqui/basketgroup.tt      |    2 +
 .../prog/en/modules/help/acqui/basketheader.tt     |    2 +
 .../prog/en/modules/help/acqui/booksellers.tt      |   12 +-
 .../prog/en/modules/help/acqui/histsearch.tt       |   14 +-
 .../prog/en/modules/help/acqui/lateorders.tt       |    2 +
 .../prog/en/modules/help/acqui/newbiblio.tt        |    5 -
 .../prog/en/modules/help/acqui/neworderbiblio.tt   |    2 +
 .../prog/en/modules/help/acqui/neworderempty.tt    |    2 +
 .../en/modules/help/acqui/newordersuggestion.tt    |    2 +
 .../prog/en/modules/help/acqui/orderreceive.tt     |    2 +
 .../prog/en/modules/help/acqui/parcel.tt           |    4 +-
 .../prog/en/modules/help/acqui/parcels.tt          |    2 +
 .../prog/en/modules/help/acqui/supplier.tt         |    4 +-
 .../prog/en/modules/help/acqui/z3950_search.tt     |    2 +
 .../prog/en/modules/help/admin/admin-home.tt       |    4 +-
 .../prog/en/modules/help/admin/aqbookfund.tt       |   41 -
 .../prog/en/modules/help/admin/aqbudget.tt         |   33 -
 .../prog/en/modules/help/admin/aqbudgetperiods.tt  |    2 +
 .../prog/en/modules/help/admin/aqbudgets.tt        |    4 +-
 .../prog/en/modules/help/admin/aqplan.tt           |    2 +
 .../modules/help/admin/auth_subfields_structure.tt |    1 +
 .../en/modules/help/admin/auth_tag_structure.tt    |    2 +
 .../en/modules/help/admin/authorised_values.tt     |    2 +
 .../prog/en/modules/help/admin/authtypes.tt        |    2 +
 .../prog/en/modules/help/admin/biblio_framework.tt |    2 +
 .../modules/help/admin/branch_transfer_limits.tt   |    2 +
 .../prog/en/modules/help/admin/branches.tt         |    4 +-
 .../prog/en/modules/help/admin/categorie.tt        |    2 +
 .../prog/en/modules/help/admin/checkmarc.tt        |    2 +
 .../prog/en/modules/help/admin/cities.tt           |    2 +
 .../prog/en/modules/help/admin/classsources.tt     |    2 +
 .../prog/en/modules/help/admin/currency.tt         |    2 +
 .../prog/en/modules/help/admin/fieldmapping.tt     |    2 +
 .../modules/help/admin/item_circulation_alerts.tt  |    2 +
 .../prog/en/modules/help/admin/itemtypes.tt        |    2 +
 .../prog/en/modules/help/admin/koha2marclinks.tt   |    2 +
 .../modules/help/admin/marc_subfields_structure.tt |    2 +
 .../prog/en/modules/help/admin/marctagstructure.tt |    2 +
 .../prog/en/modules/help/admin/matching-rules.tt   |    2 +
 .../en/modules/help/admin/patron-attr-types.tt     |    2 +
 .../prog/en/modules/help/admin/preferences.tt      |    2 +
 .../prog/en/modules/help/admin/roadtype.tt         |    2 +
 .../prog/en/modules/help/admin/smart-rules.tt      |   24 +-
 .../prog/en/modules/help/admin/stopwords.tt        |    2 +
 .../prog/en/modules/help/admin/z3950servers.tt     |    2 +
 .../modules/help/authorities/authorities-home.tt   |    3 +
 .../en/modules/help/authorities/authorities.tt     |    2 +
 .../prog/en/modules/help/authorities/detail.tt     |    2 +
 .../prog/en/modules/help/catalogue/issuehistory.tt |    2 +
 .../prog/en/modules/help/catalogue/moredetail.tt   |    2 +
 .../prog/en/modules/help/catalogue/search.tt       |    2 +
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |   39 +-
 .../prog/en/modules/help/cataloguing/additem.tt    |   16 +-
 .../prog/en/modules/help/cataloguing/merge.tt      |    8 +-
 .../prog/en/modules/help/cataloguing/moveitem.tt   |   15 +
 .../prog/en/modules/help/circ/branchoverdues.tt    |    5 +-
 .../prog/en/modules/help/circ/branchtransfers.tt   |    4 +-
 .../prog/en/modules/help/circ/circulation-home.tt  |   16 +-
 .../prog/en/modules/help/circ/circulation.tt       |   24 +-
 .../prog/en/modules/help/circ/overdue.tt           |    2 +
 .../prog/en/modules/help/circ/pendingreserves.tt   |    2 +
 .../prog/en/modules/help/circ/reserveratios.tt     |    2 +
 .../prog/en/modules/help/circ/returns.tt           |   12 +-
 .../en/modules/help/circ/selectbranchprinter.tt    |   38 +-
 .../en/modules/help/circ/transferstoreceive.tt     |    2 +
 .../prog/en/modules/help/circ/view_holdsqueue.tt   |    2 +
 .../prog/en/modules/help/circ/waitingreserves.tt   |    4 +
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    9 +-
 .../prog/en/modules/help/export/marc.tt            |    2 +
 .../en/modules/help/labels/label-edit-batch.tt     |    2 +
 .../en/modules/help/labels/label-edit-layout.tt    |    2 +
 .../en/modules/help/labels/label-edit-profile.tt   |    2 +-
 .../en/modules/help/labels/label-edit-template.tt  |    2 +
 .../prog/en/modules/help/labels/label-home.tt      |    2 +
 .../prog/en/modules/help/labels/spinelabel-home.tt |    2 +
 .../prog/en/modules/help/members/boraccount.tt     |    6 +-
 .../prog/en/modules/help/members/mancredit.tt      |    3 +
 .../prog/en/modules/help/members/maninvoice.tt     |    3 +
 .../prog/en/modules/help/members/member-flags.tt   |   67 +-
 .../en/modules/help/members/member-password.tt     |    9 +-
 .../prog/en/modules/help/members/member.tt         |    2 +
 .../prog/en/modules/help/members/memberentry.tt    |    2 +
 .../prog/en/modules/help/members/members-home.tt   |   21 +-
 .../prog/en/modules/help/members/messaging.tt      |    9 -
 .../prog/en/modules/help/members/moremember.tt     |   16 +-
 .../prog/en/modules/help/members/notices.tt        |    6 +-
 .../prog/en/modules/help/members/pay.tt            |    2 +
 .../prog/en/modules/help/members/paycollect.tt     |   53 +
 .../prog/en/modules/help/members/readingrec.tt     |    4 +-
 .../intranet-tmpl/prog/en/modules/help/nohelp.tt   |   12 +-
 .../en/modules/help/offline_circ/process_koc.tt    |    2 +
 .../prog/en/modules/help/patroncards/edit-batch.tt |    2 +
 .../en/modules/help/patroncards/edit-layout.tt     |    2 +
 .../en/modules/help/patroncards/edit-profile.tt    |    2 +
 .../en/modules/help/patroncards/edit-template.tt   |    2 +
 .../prog/en/modules/help/patroncards/home.tt       |    2 +
 .../en/modules/help/patroncards/image-manage.tt    |    2 +
 .../prog/en/modules/help/patroncards/manage.tt     |    2 +
 .../en/modules/help/reports/acquisitions_stats.tt  |   22 +-
 .../prog/en/modules/help/reports/bor_issues_top.tt |   23 +-
 .../prog/en/modules/help/reports/borrowers_out.tt  |   20 +-
 .../en/modules/help/reports/borrowers_stats.tt     |   30 +-
 .../prog/en/modules/help/reports/cat_issues_top.tt |   22 +-
 .../prog/en/modules/help/reports/catalogue_out.tt  |   24 +-
 .../en/modules/help/reports/catalogue_stats.tt     |   27 +-
 .../prog/en/modules/help/reports/dictionary.tt     |   61 +-
 .../prog/en/modules/help/reports/guided_reports.tt |   30 +-
 .../en/modules/help/reports/issues_avg_stats.tt    |   17 +-
 .../prog/en/modules/help/reports/issues_stats.tt   |   43 +-
 .../prog/en/modules/help/reports/itemslost.tt      |    6 +-
 .../prog/en/modules/help/reports/manager.tt        |   17 +-
 .../prog/en/modules/help/reports/reports-home.tt   |   26 +-
 .../prog/en/modules/help/reports/serials_stats.tt  |   22 +-
 .../prog/en/modules/help/reserve/request.tt        |  106 +-
 .../prog/en/modules/help/reviews/reviewswaiting.tt |   27 +-
 .../en/modules/help/serials/checkexpiration.tt     |   24 +-
 .../prog/en/modules/help/serials/claims.tt         |   27 +-
 .../prog/en/modules/help/serials/routing.tt        |   21 +
 .../en/modules/help/serials/serials-collection.tt  |    2 +
 .../prog/en/modules/help/serials/serials-edit.tt   |   18 +-
 .../prog/en/modules/help/serials/serials-home.tt   |    4 +-
 .../en/modules/help/serials/subscription-add.tt    |  187 +-
 .../en/modules/help/serials/subscription-detail.tt |    2 +
 .../prog/en/modules/help/suggestion/suggestion.tt  |   10 +
 .../prog/en/modules/help/tags/review.tt            |   12 +-
 .../prog/en/modules/help/tools/batchMod.tt         |   10 +-
 .../prog/en/modules/help/tools/cleanborrowers.tt   |   28 +-
 .../prog/en/modules/help/tools/csv-profiles.tt     |   45 +-
 .../prog/en/modules/help/tools/export.tt           |   42 +-
 .../prog/en/modules/help/tools/holidays.tt         |   95 +-
 .../prog/en/modules/help/tools/import_borrowers.tt |   83 +-
 .../prog/en/modules/help/tools/inventory.tt        |    3 +
 .../prog/en/modules/help/tools/koha-news.tt        |   33 +-
 .../prog/en/modules/help/tools/letter.tt           |   53 +-
 .../en/modules/help/tools/manage-marc-import.tt    |   49 +-
 .../prog/en/modules/help/tools/overduerules.tt     |   25 +-
 .../prog/en/modules/help/tools/picture-upload.tt   |   68 +-
 .../prog/en/modules/help/tools/scheduler.tt        |   44 +-
 .../en/modules/help/tools/stage-marc-import.tt     |   38 +-
 .../prog/en/modules/help/tools/tools-home.tt       |   11 +-
 .../prog/en/modules/help/tools/viewlog.tt          |   27 +-
 .../prog/en/modules/help/virtualshelves/shelves.tt |   92 +-
 .../prog/en/modules/members/moremember.tt          |    2 +-
 .../prog/en/modules/members/readingrec.tt          |   26 +-
 .../en/modules/reports/guided_reports_start.tt     |   20 +-
 .../prog/en/modules/reports/reports-home.tt        |    2 +
 .../prog/en/modules/reserve/request.tt             |    8 +
 .../prog/en/modules/serials/result.tt              |    8 +-
 .../prog/en/modules/serials/subscription-add.tt    |   41 +-
 .../prog/en/modules/serials/subscription-detail.tt |  154 +-
 .../prog/en/modules/suggestion/suggestion.tt       |   14 +-
 .../prog/en/modules/tools/koha-news.tt             |   16 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   85 +-
 .../prog/en/modules/virtualshelves/sendshelf.tt    |    2 +-
 .../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 3758 ++++++++--------
 .../prog/en/xslt/MARC21slim2MODS3-1.xsl            | 5040 ++++++++++----------
 .../prog/en/xslt/MARC21slim2RDFDC.xsl              |  392 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   69 +-
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |   25 +-
 .../prog/img/itemtypeimg/vokal/BOOK-32px.png       |  Bin 897 -> 0 bytes
 .../prog/img/itemtypeimg/vokal/BOOK.png            |  Bin 3825 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   28 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |   10 +-
 .../opac-tmpl/prog/en/includes/navigation.inc      |    7 +-
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |   23 +-
 .../opac-tmpl/prog/en/modules/opac-account.tt      |    3 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   14 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   42 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tt    |    3 +-
 .../opac-tmpl/prog/en/modules/opac-opensearch.tt   |   36 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt |    3 +-
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    3 +-
 .../prog/en/modules/opac-readingrecord.tt          |    3 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    2 +-
 .../prog/en/modules/opac-search-history.tt         |    6 +-
 .../opac-tmpl/prog/en/modules/opac-sendbasket.tt   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |    2 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |    3 +-
 .../prog/en/modules/opac-showreviews-rss.tt        |    8 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |    2 +-
 .../opac-tmpl/prog/en/modules/opac-suggestions.tt  |    3 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt   |    3 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    3 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    3 +-
 .../opac-tmpl/prog/en/modules/sco/sco-main.tt      |    6 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   79 +-
 .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl     |   22 +-
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |    4 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    4 +-
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png |  Bin 897 -> 0 bytes
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK.png      |  Bin 3825 -> 0 bytes
 koha_perl_deps.pl                                  |   13 +-
 kohaversion.pl                                     |    2 +-
 labels/label-edit-batch.pl                         |    2 +-
 labels/label-manage.pl                             |    2 +-
 members/guarantor_search.pl                        |   11 +-
 members/member.pl                                  |   19 +-
 members/moremember.pl                              |    8 +-
 misc/cronjobs/advance_notices.pl                   |    2 +-
 misc/cronjobs/longoverdue.pl                       |    3 +-
 misc/cronjobs/printoverdues.sh                     |   18 +-
 misc/migration_tools/create_analytical_rel.pl      |  152 +
 misc/migration_tools/rebuild_zebra.pl              |    9 +-
 misc/translator/tmpl_process3.pl                   |   21 +-
 opac/changelanguage.pl                             |    4 +-
 opac/opac-detail.pl                                |   32 +-
 opac/opac-reserve.pl                               |   44 +-
 opac/opac-showmarc.pl                              |   16 +-
 opac/opac-userupdate.pl                            |    7 +-
 patroncards/edit-batch.pl                          |    2 +-
 patroncards/manage.pl                              |    2 +-
 patroncards/members-search.pl                      |   14 +-
 reserve/placerequest.pl                            |    9 +
 reserve/request.pl                                 |   74 +-
 t/db_dependent/Koha.t                              |   14 +-
 t/db_dependent/Log.t                               |   55 +
 t/db_dependent/Members.t                           |  181 +-
 t/db_dependent/lib/KohaTest/Accounts.pm            |    1 -
 t/db_dependent/lib/KohaTest/Branch.pm              |    1 -
 t/db_dependent/lib/KohaTest/Circulation.pm         |    1 +
 t/db_dependent/lib/KohaTest/Members.pm             |    2 +-
 tools/batchMod.pl                                  |    8 +-
 tools/manage-marc-import.pl                        |    2 +-
 tools/viewlog.pl                                   |    6 +-
 408 files changed, 9774 insertions(+), 7443 deletions(-)
 create mode 100644 C4/Auth_cas_servers.yaml.orig
 create mode 100755 cataloguing/linkitem.pl
 create mode 100644 docs/CAS/CAS/README
 create mode 100644 docs/CAS/CASProxy/README
 create mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 create mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/de-DE/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/en/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/es-ES/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/fr-FR/{2-Optionel => 1-Obligatoire}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/nb-NO/{2-Valgfritt => 1-Obligatorisk}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/pl-PL/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/ru-RU/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_attributes.sql (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_attributes.txt (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_transports.sql (100%)
 rename installer/data/mysql/uk-UA/{optional => mandatory}/sample_notices_message_transports.txt (100%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/tinymce.css
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/linkitem.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newbiblio.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbookfund.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/aqbudget.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/moveitem.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/messaging.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/paycollect.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/routing.tt
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png
 create mode 100755 misc/migration_tools/create_analytical_rel.pl
 create mode 100644 t/db_dependent/Log.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 16:21:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 14:21:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-757-g8935132
Message-ID: <E1RGX14-0000wn-K2@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  8935132c5d73eeb716fd269dcf69c61998b9177d (commit)
       via  8d39d21039d489444b7ed6fa06b03aa87d21f5bd (commit)
      from  d50de1f040be4b6498cc054689f524fd7d13321f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8935132c5d73eeb716fd269dcf69c61998b9177d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 03:20:57 2011 +1300

    Bumping db version

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    6 ++++++
 kohaversion.pl                         |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 22:20:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 20:20:54 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6253
	updated. v3.04.00-745-gd80cf35
Message-ID: <E1RGcdC-0002AH-Gm@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6253 has been updated
       via  d80cf35e9ba39112bfdefc3ce6ba8ddae121347c (commit)
      from  18b8991cf1832a0ee79a526e6438b51fdb4f3208 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d80cf35e9ba39112bfdefc3ce6ba8ddae121347c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Oct 19 11:46:21 2011 -0400

    Bug 6253 followup: explicitly check ref value for ARRAY before casting
    
    in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
    if the incoming $operand is not a ref.  However, the incoming $operand could be some other
    kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.
    
    Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.
    
    To test, run t/db_dependent/Members.t.  Before, it fails after test 3.  After, it completes all tests.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/SQLHelper.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 22:23:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 20:23:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-759-gd80c336
Message-ID: <E1RGcfw-0002BA-IW@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d80c3369d202617a1e7b4ce87b7dcc39a308a8d5 (commit)
       via  d80cf35e9ba39112bfdefc3ce6ba8ddae121347c (commit)
      from  8935132c5d73eeb716fd269dcf69c61998b9177d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d80c3369d202617a1e7b4ce87b7dcc39a308a8d5
Merge: 8935132 d80cf35
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 09:23:36 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6253' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 C4/SQLHelper.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 19 22:25:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 20:25:08 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-82-g52bcc25
Message-ID: <E1RGchI-0002CL-Nz@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  52bcc2560a71f38f8e4ef840a180603612c14f50 (commit)
       via  d4b9ac0b967bc9a01162ddaf58fd581796ad3fda (commit)
       via  b262ab329e93e297c194b8afd285ca78eb16dfa6 (commit)
       via  2f610df500712a091930e7338136584a506af7c2 (commit)
       via  fc875a596823a433f46d494df2271ecb7cdff424 (commit)
       via  65e03f15257dfa6510fc5752c07ccd8a21131058 (commit)
       via  af65c1402cd186f7eb53b8ef79978f7c979db23b (commit)
       via  8558f011e48679322aa2e40150aeefbe5fcd3bae (commit)
       via  b7f7c10761d11ecf201d622579e4c4caec33300c (commit)
       via  39a060940877b61b05d2d5aef37c8fd76bf30382 (commit)
       via  92913143c895af00d0fed09b3b1e3e3d284ff3ca (commit)
       via  0d3e10b2fbbd45e3695b6fd9e58b01e1cedefcaa (commit)
       via  244eb3515b357038c9c1e5fcc9c7a5884d4287a8 (commit)
       via  ef27e89d8bf85d06507240c2bee025d48d6eeab1 (commit)
       via  e916ac6d6ef8870e3f1a1acb47e05d9ecd7c3263 (commit)
       via  ec258f8ff1986aef2338c7d4f4a5b4167359e171 (commit)
       via  90a0154160be1a449ff4642e2f636de15df7f2a4 (commit)
       via  9de80e949c9b892ce382d19c5b481c6fdf33a423 (commit)
       via  6591d95ddde49f7d1e6512f2b2b504676cdb2cf0 (commit)
       via  0dd0768f1862563359eb98a3342dac5d982a2d2e (commit)
       via  84f49a61c509e1fe6a71f0eb371ab39732b8c849 (commit)
       via  db4a789fd6fe4745ff96420aebc9782525782957 (commit)
       via  34d5d48308ba0895d349d83516e9d27b38c33054 (commit)
       via  b21fc3a12fa05c9e30ce25301d98ec0961e92f47 (commit)
       via  cdbc9358d0609adef845c4daa87ed623edb3f5e3 (commit)
       via  adb6d020ac0b591da7d6e3b8e1e380c4dde0081c (commit)
       via  814e486e582abec1787b57228776beb7981423cd (commit)
       via  c12eed540b06938dee739bf684e08536d39d055c (commit)
       via  be58a851c4455aecca6d56cda7cffffac065fb86 (commit)
       via  fba73262c85b51344ec5565034b0de5b536014eb (commit)
       via  b60844edbc3a324bc77fc7c0d3b3de95ee84a0cd (commit)
       via  2207cef5c41e8c0d3b30b243e3cf8df6f6074254 (commit)
      from  d030e746f98c99bfd5ab4825e24a19200a4a8244 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52bcc2560a71f38f8e4ef840a180603612c14f50
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Oct 14 22:39:56 2011 -0400

    Bug 7044 OPAC Branch Selector Fix
    
    There was a typo in the OPAC branch selector added by
    the OpacAddMastheadLibraryPulldown preference where the
    current branch wasn't selected. This patch fixes that typo.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 5938eb306acc2668b00178d88f319ad18c93e775)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d4b9ac0b967bc9a01162ddaf58fd581796ad3fda
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 13 10:02:38 2011 -0400

    Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
    
    The display of messages "to the patron" on the checkout screen
    lacked the same logic controlling messages "to other librarians,"
    affecting conditions under which the [Delete] link would be shown.
    This match makes the two categories consistent with each other:
    A delete link will be shown if the logged in branch matches the
    branch where the message was set OR if AllowAllMessageDeletion
    is turned on.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 41928b088075a5da9bffb19edf906e94aa84466f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b262ab329e93e297c194b8afd285ca78eb16dfa6
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 13 11:59:48 2011 -0400

    Fix for Bug 7019 - Circulation History Sort Order Wrong
    
    The return column sort was not using the right sort algorithm
    because it was confused by the combination of date data and
    text data ("Checked out"). I've added an explicit instruction
    to sort by date. The downside to this change is that checked
    out items are sorted with the oldest checkouts rather than
    the newest:
    
    Checked Out
    Checked Out
    10/14/1988
    07/14/2005
    
    Not perfect, but an improvement over completely incorrect
    sorting. This patch also adds the necessary check for system
    dateformat preference to properly sort metric dates.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bfaf07b2780ed033677683ef40ce04e55d7c2b3d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2f610df500712a091930e7338136584a506af7c2
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 29 12:31:09 2011 -0500

    Bug 6942 - Add link to manual to help/authorities/authorities-home.tt
    
    To test:
    Verify link to manual shows on authorities home page in-app help.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    (cherry picked from commit 5affbfc9fd5b6e5974aa9e64d074235046359950)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fc875a596823a433f46d494df2271ecb7cdff424
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Sep 29 12:26:07 2011 -0500

    Bug 6942 - Add link to manual to help/admin/admin-home.tt
    
    To test:
    Verify link to manual shows on administration home page in-app help.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    (cherry picked from commit a43974029205fb830eef8989b8a5899d0561840d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 65e03f15257dfa6510fc5752c07ccd8a21131058
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 15 14:10:04 2011 +1300

    Adding another developer to the history
    (cherry picked from commit 1576e3f410b3c4914d1b803953f64e32c20d3e74)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit af65c1402cd186f7eb53b8ef79978f7c979db23b
Author: Greg Barniskis <gbarniskis at gmail.com>
Date:   Mon Sep 26 12:07:20 2011 -0500

    Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl
    
    Widen module name allowance in the format statement, adjust other
    columns to be generous but not-so-much as before, modify report
    header and footer print statements to align and clarify. Very very
    long module names or version numbers are still subject to possible
    truncation.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    
    Sign off comment: With this patch module names are not truncated, which is an
    improvement. Lines are still too long to fit an 80 column display, and so they
    wrap around, but tht is a minor annoyance compared to the truncated names.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e5e5e3155e4c4b3f51415d08a324f84142e91f3d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8558f011e48679322aa2e40150aeefbe5fcd3bae
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Aug 30 14:58:36 2011 +0100

    Bug 6806 Fix encoding of title in subscription-add
    
    Port of Maxime Pelletier <maxime.pelletier at libeo.com>'s patch for
    3.2 to TT
    Stops the mangling of titles containing accented characters
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d010412c66a9291d13676ed7a3fbdaaf1b269b59)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b7f7c10761d11ecf201d622579e4c4caec33300c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Aug 25 18:32:51 2011 -0400

    Bug 6789: biblios with many items can result in broken search results link
    
    This patch fixes an issue whereby biblios with many items (often > 500) would index,
    but not the biblionumber itself, resulting in search results with a) inaccurate item counts
    and b) no biblionumber to use in the link to the details page.  This is due to Net::Z3950::ZOOM  not providing
    a mechanism for specifying different connection attributes; the maximumRecordSize ZOOM connection attribute,
    if not specified, defaults to 1MB, which is less than the size of a MARC record with many, many 952 fields.  Since
    it is unlikely we can fix Net::Z3950::ZOOM in a timely fashion, this patch aims to build a workaround on the Koha end.
    
    This patch changes EmbedItemsInMarcBiblio to use append_fields instead of insert_ordered_fields,
    so the 999$c will come before the item records.  It's VERY unlikely we will encounter more than 1MB of biblio-level MARC
    content, as this would break the ISO-2709 standard by a large factor.
    
    To this end, it also moves the fix_biblio_ids portion of get_corrected_marc_record out of rebuild_zebra.pl,
    and makes it a part of GetMarcBiblio (right before EmbedItemsInMarcBiblio, so the 952s still come last).  fix_biblio_ids
    is kept as a subroutine for the deletion portion of rebuild_zebra.pl, which still uses it.
    
    It also uses the subroutine parameter in GetMarcBiblio to do the EmbedItemsInMarcBiblio action, rather than having
    rebuild_zebra.pl perform it on the itemless record returned from GetMarcBiblio.  Simpler and cleaner that way.
    
    To verify bug issue:
    1. Find a biblio with over 700 items (or enough that the resulting MARCXML is greater than 1MB)
    2. search for this biblio (in a search that would return multiple results, not just this title).  You should get the title in
    the results list
    3. attempt to click the link to this biblio's details page; the biblionumber should be blank, leading to a 404
    
    To test solution:
    1. Apply patch
    2. modify the biblio slightly (click the 005 for example) and save
       OR manually add the biblio to zebraqueue for reindexing
    3. after rebuild_zebra.pl -z -b -x runs, use the same search as above. The title should still appear.
    4. click the link, and find yourself on the biblio detail page as desired
    
    Signed-off-by: D Ruth Bavousett <ruth at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4e95e94727b09b33d2f6c597bdd218a59dcc3681)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 39a060940877b61b05d2d5aef37c8fd76bf30382
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 14 16:37:54 2011 -0400

    Bug 5995 Followup: checkpw was returning inconsistent values
    
    In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
    userid.  This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
    uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
    desired value in the right way.
    (cherry picked from commit dcb4ac77fbfd813cc0eb39e060b49a7b8d491016)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 92913143c895af00d0fed09b3b1e3e3d284ff3ca
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Oct 5 09:53:02 2011 -0400

    Fix for Bug 6970 - logout not redirecting to login page
    
    For some reason the latest version of Firefox doesn't like
    the javascript which empties the cart on logout. As Ian points
    out, there is code which tries to redirect to "about:blank"
    and close the window (since the main context of the function
    is the Cart's popup window.
    
    This patch adds a parameter to the delBasket function so
    that we can pass a "popup" context to the function and
    choose whether or not we want to ask JS to close the window.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d139d400b11e76f19ed208d4898d57f678acf9f4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0d3e10b2fbbd45e3695b6fd9e58b01e1cedefcaa
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 19 16:01:49 2011 -0400

    Updating Version Number to 3.04.05.001

commit 244eb3515b357038c9c1e5fcc9c7a5884d4287a8
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Sep 9 11:17:19 2011 -0400

    Bug 6862: Duplicate VOKAL Book icons
    
    Removes duplicate VOKAL icons for Book.png and Book-32px.png.  Database updated in both
    itemtypes and authorised_values tables to reflect change, so no icon loss should be seen
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ef27e89d8bf85d06507240c2bee025d48d6eeab1
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 30 15:27:27 2011 -0400

    bug 5780 followup: RIS export now includes all URLs
    
    Also cleanup whitespace and adjust the line ending per
    bug 6769.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 72eeac56fdb967d3fcfb08fc3f8dfb56bf74e755)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e916ac6d6ef8870e3f1a1acb47e05d9ecd7c3263
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Feb 21 10:29:48 2011 +1300

    Bug 5780 - Export the URI as part of a RIS export
    
    Squashed commit of the following:
    
    commit 8486cd30caf879ddff93aaa5fab722838db946a1
    Author: Chris Cormack <chrisc at catalyst.net.nz>
    Date:   Mon Feb 21 10:23:07 2011 +1300
    
        WR76962 - Fixing typos
    
    commit f3ac9d9233db2b410fded112e16e54b27280af0a
    Author: Chris Cormack <chrisc at catalyst.net.nz>
    Date:   Mon Feb 21 09:56:43 2011 +1300
    
        WR76962 - Extending RIS support to handle URI
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 412666e52b4e8f7bc5ae70f2b2978b1bd088a885)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ec258f8ff1986aef2338c7d4f4a5b4167359e171
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Sep 29 18:05:49 2011 +1300

    Bug 6938 - replace two subscription fields that were incorrectly removed
    
    The "Note for OPAC" and "Note for staff" fields in subscriptions were
    removed, but they are their own fields in the database and display in
    other places too. This patch puts them back so that they can once again
    be edited.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 2f11d527a0749e86350d62055f289aaee9435848)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 90a0154160be1a449ff4642e2f636de15df7f2a4
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date:   Tue Sep 27 18:53:52 2011 +0200

    Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 518710878972a72b8d7b306af571b7c543267ddd)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9de80e949c9b892ce382d19c5b481c6fdf33a423
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 2 18:39:53 2011 +0200

    Bug 6840 warning in logs
    
    In staff interface, in search (catalogue/search.pl), there is a warning saying:
    [Fri Sep  2 18:20:24 2011] search.pl: Use of uninitialized value $key in hash
    element at /home/paul/koha.dev/koha-community/C4/Templates.pm line 227.
    
    The problem happens when searching from the quick search toolbar, not when you
    search from advanced search.
    Investigating, it seems it's because the sort_by is not defined in this case.
    
    This patch
    * fixes the problem in Search.pl by setting the parameter only if there is a sort_by field
    * modify te Template->param sub to get a better error message. Instead of having just "use of uninitia..." get the value you try to set to an empty key. Much easier to understand which line causes the problem
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6591d95ddde49f7d1e6512f2b2b504676cdb2cf0
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sun Sep 25 11:25:25 2011 +0200

    Bug 6912 Test 008 presence in get CoinS function
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7621591ae697328798a44a95757352a147e33d72)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0dd0768f1862563359eb98a3342dac5d982a2d2e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 13 15:54:48 2011 +1300

    Bug 6885 Follow up to fix superlibarian permission check
    (cherry picked from commit cdd798ec3216c6019adccc40935e93736ce4dc3b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 84f49a61c509e1fe6a71f0eb371ab39732b8c849
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Sep 19 19:53:38 2011 +0200

    Bug 6885 Allow superlib to delete items from any library
    
    When IndependantBranches syspref is enabled, a 'regular' user can only
    delete items belonging to his/her library. But a superlibrarian should
    have the permission to delete items from all libraries. He can't for the
    time being. This is fix by this patch.
    
    How to test?
    
    - On a multi-libraries Koha, activate IndependantBranches
    - Log in with a superlibrarian user
    - Find a biblio with one item from another library than the user home
      library
    - Click on Edit > Edit Items
    - On the list of items, all lines have Delete link
    - If you try to delete an item from another library than the user home
      library, deletion will fail.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit b64dbb246c8f29ac1c5e40b88a1f26f8d207b18d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit db4a789fd6fe4745ff96420aebc9782525782957
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Sep 1 11:53:16 2011 +0200

    6278 Funny translation bug with XSLT subfieldSelect parameters
    
    This patch resolves the situation of translating the parameters at (meaning subfield a and t) of subfieldSelect by replacing at with a_t. This string will not be translated and the xslt function subfieldSelect just ignores the underscore.
    It is a pragmatic and easy solution. Theoretically, we should look for a solution in the translation parser. This is much harder and would probably not result in better code in those modules.
    
    Test this patch with the following remarks in mind:
    1) This patch deals with XSLT. So you should enable XSLT at OPAC detail.
    2) In English or any language not translating the word at: Just check if the links for a MARC 490, 773, 780 or 785 still work at the opac detail page.
    3) For a language translating the word at (like Dutch where at becomes bij), you should first rerun your translation process (at least for the OPAC).
    4) In that language: Check the results on the vernacular opac detail page for MARC 490, 773, 780 or 785. Without the patch, you would not see a link following e.g. the Series label (with 490 first indicator set to 1). With the patch, you should see a link now.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Pragmatic solution for an annoying problem.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a4baa4df1843f1390f372d1569eb446171705742)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 34d5d48308ba0895d349d83516e9d27b38c33054
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Sep 23 11:49:37 2011 -0400

    Fix for Bug 5898 - search to hold feature not clearing
    
    Search to hold cookie is now cleared when the user loads a blank
    circulation page and when the user logs out.
    
    The user also now has the option to "forget" the current
    search to hold patron by choosing an option from the
    search to hold menu on the search results page.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Tested:
    Forget <patron> from search to hold results clears cookie
    Logging out clears the cookie - testing note: i had to clear my cookies and test fresh before this would work
    Loading a blank circulation page (Check Out from the circulation-home) clears the cookie.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7f6656aff84b2e9e47dd3317e8c72d69aaa8e433)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b21fc3a12fa05c9e30ce25301d98ec0961e92f47
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Wed Oct 5 13:16:37 2011 -0400

    Bug 6977 : Adds support for repeatable subfields when importing authorities.
    
    Before this patch, if we tried to import an authority with multiple $x
    subfields into a bibliographic record, only the last value get added
    to the form.
    
    All repeated values should now be sent to the form.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f97726406697f7973d2f8118049acaac2f95a3ed)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cdbc9358d0609adef845c4daa87ed623edb3f5e3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 2 18:12:10 2011 +0200

    Bug 5630, follow-up
    
    Fixes chris comment 28, that was a consequence of Marcel comment 27
    Recent error
    [Thu Sep 01 14:22:45 2011] [error] [client 192.87.126.61] [Thu Sep  1 14:22:45
    2011] opac-MARCdetail.pl: DBD::mysql::st execute failed: Unknown column
    'limit_desc' in 'field list' at /usr/share/koha/testclone/C4/Auth.pm line 276.
    Seems to come from this commit 9a3950f673c28688a2ead6514c3320e34ec0cc4c (5630
    CAS Improvements)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1c0702c76e50173289a0ee340a9c5f190515d9c3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit adb6d020ac0b591da7d6e3b8e1e380c4dde0081c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Aug 30 10:41:10 2011 -0400

    Bug 5630 Followup: checkpw_ldap not imported
    
    If LDAP authentication is used, Koha barks that C4::Auth::checkpw_ldap is
    undefined, which is true.  checkpw_ldap needs to be imported from C4::Auth_with_ldap,
    like it was before the bug fix for 5630
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 74c7c4e3a5d6a3ec20b525936c5ffe2f9b188744)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 814e486e582abec1787b57228776beb7981423cd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Mar 31 10:06:46 2011 +1300

    Bug 5630 CAS improvements
    
    Squashed commit of the following:
    
    commit 0e13a5278e11b288e48190dc26f31e96d06598dd
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:39 2011 +0100
    
        Bug 5630 : fixing C4/Auth.pm
    
    commit b55abc7a0dc1ca43b2610a27246293e9a9346e18
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:38 2011 +0100
    
        Bug 5630 : Adds CAS documentation
    
    commit df0098a6a65465e6e734f99f65fb453dd3fa11d1
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:37 2011 +0100
    
        Bug 5630 : ilsdi service AuthenticatePatron doesn't with CAS syspref on
    
        Signed-off-by: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    
    commit 31c8f0c0facfafae011ad24c9d458c50f2fad296
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:36 2011 +0100
    
        Bug 5630 : Adds the ability to authenticate against multiple CAS servers
    
    commit 9d0def826135d5756533dc0dcf8e0a107d1ac8fc
    Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
    Date:   Wed Jan 19 21:24:34 2011 +0100
    
        Auth_with_cas : removing a warning
    
        $sth was defined twice in a function
        Removing the second definition
    
    commit 5ee550e9a2bb7ab6bc09f14fced6ce0df8011eb0
    Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
    Date:   Wed Jan 19 21:24:33 2011 +0100
    
        Bug 6012 : MT 2270: CAS proxy
    
        CAS Proxy
        Examples included are now really usable
    
        Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 046c996c2fa8150b8c6a037976c9c22826e04b8b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c12eed540b06938dee739bf684e08536d39d055c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Sep 5 11:02:19 2011 +1200

    Bug 5459 - Holds not being shifted when merging biblios
    
    Holds are now shifted and reordered by date placed.
    Holds already marked waiting, or in transit are not reordered.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 71defcbc6c851f54da223c040aa5d95e0bd43b73)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit be58a851c4455aecca6d56cda7cffffac065fb86
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 10 22:10:41 2011 +1300

    Fixing line endings
    (cherry picked from commit fd052de5e179a26f9fec32141cc6d0f07b31ad9d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fba73262c85b51344ec5565034b0de5b536014eb
Author: Mason James <mtj at kohaaloha.com>
Date:   Mon Oct 10 05:12:07 2011 +1300

    Bug 6992 - add missing tab chars to history.txt
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c42e0084bd4a29f383c7a23724c8255da70ba836)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b60844edbc3a324bc77fc7c0d3b3de95ee84a0cd
Author: Mason James <mtj at kohaaloha.com>
Date:   Mon Oct 10 03:15:44 2011 +1300

    Bug 6991 - correcting committer info and adding company to koha-team page
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4216b980f3580eeec5af60ef030ac39277e587eb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2207cef5c41e8c0d3b30b243e3cf8df6f6074254
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Aug 4 12:57:52 2011 +0100

    Bug 6667 Correct documentation of function
    
    Return list was documented as being in the reverse order
    to how it is returned. Correct the perldoc description
    
    also removed comments which did not help anyone trying
    to make sense of this subroutine
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Just improving text comments. No code changes involved.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0cf8194d5f6d1a401eb78abad88476ef061928c5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |  127 +-
 C4/Auth_cas_servers.yaml.orig                      |   12 +
 C4/Auth_with_cas.pm                                |  181 +-
 C4/Auth_with_ldap.pm                               |    4 +-
 C4/Biblio.pm                                       |    7 +-
 C4/Items.pm                                        |    6 +-
 C4/Members.pm                                      |    5 +-
 C4/Reserves.pm                                     |   49 +-
 C4/Ris.pm                                          |   22 +
 C4/Templates.pm                                    |    6 +-
 authorities/blinddetail-biblio-search.pl           |   21 +-
 catalogue/search.pl                                |    2 +-
 cataloguing/merge.pl                               |    5 +
 docs/CAS/CAS/README                                |    8 +
 docs/CAS/CASProxy/README                           |    9 +
 docs/CAS/CASProxy/examples/casSession.tmp          |  Bin 0 -> 134 bytes
 docs/CAS/CASProxy/examples/koha_webservice.pl      |   58 +
 docs/CAS/CASProxy/examples/proxy_cas.pl            |   91 +
 docs/CAS/CASProxy/examples/proxy_cas_callback.pl   |   62 +
 docs/CAS/CASProxy/examples/proxy_cas_data.pl       |   80 +
 docs/history.txt                                   |   39 +-
 installer/data/mysql/updatedatabase.pl             |   10 +
 .../intranet-tmpl/prog/en/css/staff-global.css     |   12 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |   15 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    4 +
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    4 +-
 .../authorities/blinddetail-biblio-search.tt       |   79 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 .../prog/en/modules/catalogue/results.tt           |   22 +-
 .../prog/en/modules/circ/circulation.tt            |    7 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    2 +-
 .../prog/en/modules/help/admin/admin-home.tt       |    4 +-
 .../modules/help/authorities/authorities-home.tt   |    3 +
 .../prog/en/modules/members/readingrec.tt          |    5 +-
 .../prog/en/modules/serials/result.tt              |    8 +-
 .../prog/en/modules/serials/subscription-add.tt    |   41 +-
 .../prog/en/modules/serials/subscription-detail.tt |    2 +
 .../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 3758 ++++++++--------
 .../prog/en/xslt/MARC21slim2MODS3-1.xsl            | 5040 ++++++++++----------
 .../prog/en/xslt/MARC21slim2RDFDC.xsl              |  392 +-
 .../prog/img/itemtypeimg/vokal/BOOK-32px.png       |  Bin 897 -> 0 bytes
 .../prog/img/itemtypeimg/vokal/BOOK.png            |  Bin 3825 -> 0 bytes
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt   |   14 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   10 +-
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |    4 +-
 .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl        |    4 +-
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png |  Bin 897 -> 0 bytes
 .../opac-tmpl/prog/itemtypeimg/vokal/BOOK.png      |  Bin 3825 -> 0 bytes
 koha_perl_deps.pl                                  |   13 +-
 kohaversion.pl                                     |    2 +-
 misc/migration_tools/rebuild_zebra.pl              |    9 +-
 53 files changed, 5471 insertions(+), 4795 deletions(-)
 create mode 100644 C4/Auth_cas_servers.yaml.orig
 create mode 100644 docs/CAS/CAS/README
 create mode 100644 docs/CAS/CASProxy/README
 create mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
 create mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
 create mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png
 delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:25:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:25:19 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6553
	created. v3.04.00-760-g0ae2c3c
Message-ID: <E1RGeZa-0002Zk-Vw@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6553 has been created
        at  0ae2c3c4ceab85993ee23360d2c0d5409f465df6 (commit)

- Log -----------------------------------------------------------------
commit 0ae2c3c4ceab85993ee23360d2c0d5409f465df6
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Oct 3 11:22:30 2011 -0400

    Bug 6553: parentheses in authors break tracings
    
    If an author's name includes parentheses or other escape-characters, the tracing links
    produced in the OPAC and staff client fail in XSLT mode.  This patch wraps the author names
    in double-quotes, providing the necessary escapement.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan:
    - Create a new framework, delete Thesaurus from 700 and other fields
    - Create a new record in this framework
    - Add 700$a - use parentheses
    - Check the search links in OPAC and staff detail pages
    > before patch link was broken, after it works
    
    Note: Links are only broken when no authorities are being used.
    When using authorities the link uses the auth number instead of the text
    for linking, so the parentheses don't matter for search.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:26:26 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:26:26 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-760-g0ae2c3c
Message-ID: <E1RGeaf-0002ad-Tv@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  0ae2c3c4ceab85993ee23360d2c0d5409f465df6 (commit)
      from  d80c3369d202617a1e7b4ce87b7dcc39a308a8d5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    2 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:31:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:31:22 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6094
	created. v3.04.00-762-gd93e19f
Message-ID: <E1RGefS-0002cN-6x@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6094 has been created
        at  d93e19fd701a6290183ee7d8ae1bb9b0c3e8d343 (commit)

- Log -----------------------------------------------------------------
commit d93e19fd701a6290183ee7d8ae1bb9b0c3e8d343
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 25 11:33:23 2011 +0200

    6094 Fixing ModAuthority problems
    
    Only contains db revision to insert new table need_merge_authorities.
    You can apply the revision by running
    cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
    your version while testing.)
    
    Oct 19, 2011: Rebased after functionality patch signoff.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 05d35b0ae0af257b51fbd14a9ec010c957157a8f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Apr 7 10:14:08 2011 +0200

    6094 Fixing ModAuthority problems
    
    Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
    (AuthoritiesMarc.pm).
    
    Instead of folder modified_authorities, now introducing a table for this
    purpose: need_merge_authorities. This eliminates several permissions and
    security issues. This change applies to AuthoritiesMarc.pm and
    merge_authority.pl.
    
    POD lines added for ModAuthority. Deprecated parameter $merge removed.
    
    Test this patch by applying the db revision first from the second patch.
    
    August 4, 2011: Rebased.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    
    Thanks Marcel. It works as advertised. Both modes are functionnal
    (back):
    
    - Immediate with dontmerge=0: After modifying an authority record, its
      linked biblios are immediately modified. This isn't the case in 3.4.5.
    - Delayed with dontmerge=1: After modifying an authority record, its
      linked biblios are not modified. But an entry is added to
      need_merge_authority new table and 'merge_authorities.pl -b' script
      updates biblios.
    
    Comment: need_merge_authority, like zebraqueue, should be cleared
    from time to time.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:36:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:36:01 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6957
	created. v3.04.00-764-gaedb86a
Message-ID: <E1RGejw-0002dY-WC@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6957 has been created
        at  aedb86a6790babe52070439cab2f29e1d020cea8 (commit)

- Log -----------------------------------------------------------------
commit aedb86a6790babe52070439cab2f29e1d020cea8
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 3 10:43:35 2011 -0400

    Fix for Bug 6957, authors disappearing when emailing lists
    
    Standard author information wasn't even in the template markup, only
    "additional author." Added standard author and improved output of
    additional authors (hiding label when empty).
    
    Also added subtitle via GetRecordValue (see bug 3550).
    
    Also added check for and output of OPACBaseURL in order
    to make OPAC links in the email clickable.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    QA revision:  renamed OPACBaseurl to OPACBaseURL for consistency
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 96300cc592bfcb5bbf0b09989fac8f7fadc5f684
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 11:32:26 2011 +1300

    Bumping database version

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:37:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:37:54 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6980
	created. v3.04.00-765-gd150c98
Message-ID: <E1RGelm-0002eK-86@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6980 has been created
        at  d150c98540e98cf783a7e06b1de76988cd4752c2 (commit)

- Log -----------------------------------------------------------------
commit d150c98540e98cf783a7e06b1de76988cd4752c2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 6 14:27:16 2011 -0400

    Fix for Bug 6980, Patron attributes are shown when ExtendedPatronAttributes is disabled
    
    This patch adds a check for the value of the ExtendedPatronAttributes
    preference to the scripts and corresponding logic to the templates
    controlling the sidebar menu.
    
    The patch also corrects a duplication of attributes code in moremember.pl
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    1) Added extended patron attributes in configuration, turned ExtendedPatronAttributes on
    2) Altered patron details, added values for patron attributes
    > Verified patron attributes show show correctly
    3) Turned off ExtendedPatronAttributes
    > Verified patron attributes were hidden everywhere
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:40:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:40:21 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7027
	created. v3.04.00-766-ga46cbc0
Message-ID: <E1RGeo9-0002g7-MS@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7027 has been created
        at  a46cbc03ee60b8894e5f37f830d2deea4629aa05 (commit)

- Log -----------------------------------------------------------------
commit a46cbc03ee60b8894e5f37f830d2deea4629aa05
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Oct 13 23:47:16 2011 +0200

    Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
    
    Rephrasing, correcting typos, removing blank lines
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Does not break the web-installer and I'm assuming
    Katrin is doing the right thing when it comes to
    the German text, so signing off!
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:41:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:41:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-766-ga46cbc0
Message-ID: <E1RGep0-0002gw-Pw@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a46cbc03ee60b8894e5f37f830d2deea4629aa05 (commit)
       via  d150c98540e98cf783a7e06b1de76988cd4752c2 (commit)
       via  aedb86a6790babe52070439cab2f29e1d020cea8 (commit)
       via  96300cc592bfcb5bbf0b09989fac8f7fadc5f684 (commit)
       via  d93e19fd701a6290183ee7d8ae1bb9b0c3e8d343 (commit)
       via  05d35b0ae0af257b51fbd14a9ec010c957157a8f (commit)
      from  0ae2c3c4ceab85993ee23360d2c0d5409f465df6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/AuthoritiesMarc.pm                              |   35 +++++++++++---------
 circ/circulation.pl                                |   10 ++++-
 .../de-DE/mandatory/message_transport_types.txt    |    3 +-
 .../data/mysql/de-DE/mandatory/subtag_registry.txt |    7 ++--
 installer/data/mysql/de-DE/mandatory/userflags.txt |    2 +-
 .../marc21/mandatory/authorities_normal_marc21.txt |    9 ++---
 .../optional/marc21_default_matching_rules.txt     |    4 +--
 .../marc21/optional/marc21_fastadd_framework.txt   |    2 +-
 .../optional/marc21_simple_bib_frameworks.txt      |    3 +-
 installer/data/mysql/de-DE/optional/auth_val.txt   |    2 +-
 .../mysql/de-DE/optional/patron_categories.txt     |   12 +++----
 .../mysql/de-DE/optional/sample_creator_data.txt   |    2 +-
 .../data/mysql/de-DE/optional/sample_news.txt      |    2 +-
 .../mysql/de-DE/optional/sample_z3950_servers.txt  |    1 +
 installer/data/mysql/kohastructure.sql             |   11 ++++++
 installer/data/mysql/updatedatabase.pl             |    7 ++++
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    4 +-
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |    4 +-
 .../prog/en/modules/members/moremember.tt          |   10 +++---
 .../prog/en/modules/virtualshelves/sendshelf.tt    |   12 ++++---
 .../opac-tmpl/prog/en/modules/opac-sendshelf.tt    |   11 ++++--
 kohaversion.pl                                     |    2 +-
 members/boraccount.pl                              |   10 ++++-
 members/mancredit.pl                               |    8 ++++-
 members/maninvoice.pl                              |    9 ++++-
 members/member-flags.pl                            |   10 ++++-
 members/member-password.pl                         |   10 ++++-
 members/moremember.pl                              |    9 +++--
 members/notices.pl                                 |   10 ++++-
 members/pay.pl                                     |    8 ++++-
 members/readingrec.pl                              |   10 ++++-
 misc/migration_tools/merge_authority.pl            |   18 +++-------
 opac/opac-sendshelf.pl                             |   12 +++++--
 virtualshelves/sendshelf.pl                        |   10 ++++-
 34 files changed, 179 insertions(+), 100 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:55:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:55:50 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7016
	created. v3.04.00-767-g823b807
Message-ID: <E1RGf38-0002jz-Gc@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7016 has been created
        at  823b807ac9e20706bdd3931962e126affc72cbeb (commit)

- Log -----------------------------------------------------------------
commit 823b807ac9e20706bdd3931962e126affc72cbeb
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Oct 12 15:35:31 2011 -0400

    Bug 7016: CanBookBeReserved uses GetItemsInfo unnecessarily
    
    CanBookBeReserved uses the very heavy-weight function GetItemsInfo to simply retrieve
    the itemnumbers attached to a given biblio.  The function get_itemnumbers_of() is much
    lighter-weight and returns the required information; switching to it will reduce the overall
    system resource cost of placing a hold.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:56:02 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:56:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-767-g823b807
Message-ID: <E1RGf3K-0002km-RS@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  823b807ac9e20706bdd3931962e126affc72cbeb (commit)
      from  a46cbc03ee60b8894e5f37f830d2deea4629aa05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Reserves.pm |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:57:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:57:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7049
	created. v3.04.00-768-g224140a
Message-ID: <E1RGf4o-0002la-7S@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7049 has been created
        at  224140a2b60aa7bbf4aeb352e1c31f80974a05db (commit)

- Log -----------------------------------------------------------------
commit 224140a2b60aa7bbf4aeb352e1c31f80974a05db
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 17 22:04:53 2011 +0200

    Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
    
    The item form on the order receive page (AcqCreateItem = on receive) contains a
    lot of blank space which makes it hard to read and fill out.
    
    To test:
    - set AcqCreateItem = on receive
    - create basket, order something, receive shipment
    - check item form is nicely formatted and doesn't include lots of blank space
    
    Note: It will be easier to test if you have an ACQ framework created to hide some
    unnecessary subfields, because the hidden fields create the blank space.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Created an ACQ framework and hid some of the fields (hidden = 5). Before the
    patch there were gaps between the fields as shown in the screenshot from
    Katrin. After the patch fields line up nicely, with no extra space between
    them.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 00:57:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 22:57:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-768-g224140a
Message-ID: <E1RGf55-0002mM-H7@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  224140a2b60aa7bbf4aeb352e1c31f80974a05db (commit)
      from  823b807ac9e20706bdd3931962e126affc72cbeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/acqui/orderreceive.tt          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 01:15:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 23:15:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-769-gbf64266
Message-ID: <E1RGfM8-0003P8-0J@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  bf64266e9932853e42a17f98d27417319a4ef7fe (commit)
      from  224140a2b60aa7bbf4aeb352e1c31f80974a05db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 .../prog/en/modules/admin/preferences/opac.pref    |    7 +++++++
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    1 +
 5 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 01:16:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 19 Oct 2011 23:16:46 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-770-gedd7f05
Message-ID: <E1RGfNO-0003Ql-5w@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  edd7f0588ebbea9f3dd6c1e9fd54accabf6c3644 (commit)
      from  bf64266e9932853e42a17f98d27417319a4ef7fe (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit edd7f0588ebbea9f3dd6c1e9fd54accabf6c3644
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 12:16:30 2011 +1300

    Bumping database version

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl |    2 +-
 kohaversion.pl                         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 02:57:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 00:57:57 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6572
	created. v3.04.00-771-g885f016
Message-ID: <E1RGgxJ-0004QD-D6@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6572 has been created
        at  885f016394a4cf00ccf3c8b0951883b453e2bcc3 (commit)

- Log -----------------------------------------------------------------
commit 885f016394a4cf00ccf3c8b0951883b453e2bcc3
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Sat Jul 9 12:50:06 2011 -0400

    Bug 6572: Script batch anonymisation wrapper
    
    This little script, given a --days numeric parameter, will anonymise checkouts
    before that many days ago.  Useful for sites that want to automatically do this on
    a periodic (cronnable) basis.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 02:58:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 00:58:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-771-g885f016
Message-ID: <E1RGgyF-0004RM-1n@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  885f016394a4cf00ccf3c8b0951883b453e2bcc3 (commit)
      from  edd7f0588ebbea9f3dd6c1e9fd54accabf6c3644 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/batch_anonymise.pl |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)
 create mode 100755 misc/cronjobs/batch_anonymise.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 03:05:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 01:05:39 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7057
	created. v3.04.00-772-ga1e3975
Message-ID: <E1RGh4k-0004Ub-Vo@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7057 has been created
        at  a1e3975067bf484f8d5f621e042e41baeb69d7b7 (commit)

- Log -----------------------------------------------------------------
commit a1e3975067bf484f8d5f621e042e41baeb69d7b7
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 17:56:18 2011 -0400

    Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
    
    Replaces call to GetMemberDetails with a call to GetMember.  Much more efficient,
    and since only branchcode is used, no required data is lost.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 03:06:11 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 01:06:11 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-772-ga1e3975
Message-ID: <E1RGh5G-0004VN-TO@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a1e3975067bf484f8d5f621e042e41baeb69d7b7 (commit)
      from  885f016394a4cf00ccf3c8b0951883b453e2bcc3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Reserves.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 03:08:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 01:08:03 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7059
	created. v3.04.00-773-gfcd28a6
Message-ID: <E1RGh75-0004WB-Nf@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7059 has been created
        at  fcd28a664acaa4aed52604a4150f752bbe118798 (commit)

- Log -----------------------------------------------------------------
commit fcd28a664acaa4aed52604a4150f752bbe118798
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 18:31:00 2011 -0400

    Bug 7059: Remove GetMemberDetails from reserve/request.pl
    
    Replaces all four usages of GetMemberDetails with GetMember, since none of the
    hashref fields used were anything other than those in borrower table, which GetMember
    returns.
    
    To Test:
    1.  Apply patch
    2.  Go to reserve/request.pl; the page should load without error
    3.  Search for a cardnumber: the page should load without error
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 03:08:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 01:08:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-773-gfcd28a6
Message-ID: <E1RGh7j-0004Wx-UX@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  fcd28a664acaa4aed52604a4150f752bbe118798 (commit)
      from  a1e3975067bf484f8d5f621e042e41baeb69d7b7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 reserve/request.pl |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 03:10:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 01:10:10 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7060
	created. v3.04.00-774-g769acee
Message-ID: <E1RGh98-0004Ya-JV@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7060 has been created
        at  769acee41ae258ea4efb0114eb7995736496a9cf (commit)

- Log -----------------------------------------------------------------
commit 769acee41ae258ea4efb0114eb7995736496a9cf
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 19:55:22 2011 -0400

    Bug 7060: GetMemberDetails unnecessary in C4::Circulation
    
    Replaces all instances of GetMemberDetails with the more efficient GetMember.  Since
    no hash values other than the borrowers table's fields are used in this module, the
    transition is safe.
    
    To test:
    
    1.  Checkout a material; the page should load without error
    2.  Renew a material: the page should load without error
    3.  Return a material: the page should load without error
    
    The above test plan invokes all the subroutines affected by this patch; any call to an undefined
    value in a hashref should give a warning
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:31:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:31:13 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6094
	updated. v3.04.00-763-gc56d12c
Message-ID: <E1RGuaP-00077q-JG@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6094 has been updated
       via  c56d12c721684bfd3bac0e9bd9cf17f8f29651a9 (commit)
      from  d93e19fd701a6290183ee7d8ae1bb9b0c3e8d343 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c56d12c721684bfd3bac0e9bd9cf17f8f29651a9
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 20 09:57:12 2011 +0200

    6094 Follow up for cleanup_database
    
    Adds purging completed entries from need_merge_authorities table.
    If you set dontmerge to ON, you need to periodically remove records.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/cleanup_database.pl |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:32:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:32:56 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-776-g05c2f83
Message-ID: <E1RGuc4-00079M-Od@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  05c2f83817ab41a5d4f876395b6a560d0e83de29 (commit)
       via  c56d12c721684bfd3bac0e9bd9cf17f8f29651a9 (commit)
       via  769acee41ae258ea4efb0114eb7995736496a9cf (commit)
      from  fcd28a664acaa4aed52604a4150f752bbe118798 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 05c2f83817ab41a5d4f876395b6a560d0e83de29
Merge: 769acee c56d12c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Oct 21 04:32:31 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                 |   14 +++++++-------
 misc/cronjobs/cleanup_database.pl |   18 ++++++++++++++----
 2 files changed, 21 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:40:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:40:53 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7042
	created. v3.04.00-777-ga7ee299
Message-ID: <E1RGujl-0007ES-Hi@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7042 has been created
        at  a7ee2993f02fb45f704c92ffdc49f840e05f5bd0 (commit)

- Log -----------------------------------------------------------------
commit a7ee2993f02fb45f704c92ffdc49f840e05f5bd0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Oct 17 11:32:50 2011 +0200

    7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
    
    Improving the cleanup_database.pl script in two aspects:
    1) In some cases CGI::Session seems to place quotes around the atime and ctime
    data in the a_session field. Two regexps now take this into account.
    2) If the --sessdays parameter is used, the --sessions parameter is now
    implicitly enabled too.
    
    With thanks to Ian Bays and Tom Hanstra.
    
    Signed-off-by: Ian Bays <ian.bays at ptfs-europe.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:43:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:43:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-777-ga7ee299
Message-ID: <E1RGulp-0007GL-II@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a7ee2993f02fb45f704c92ffdc49f840e05f5bd0 (commit)
      from  05c2f83817ab41a5d4f876395b6a560d0e83de29 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/cronjobs/cleanup_database.pl |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:48:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:48:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6854
	created. v3.04.00-778-g906ef4b
Message-ID: <E1RGuql-0007IS-37@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_6854 has been created
        at  906ef4b28c376254743f948808e8ae47bb6f0a01 (commit)

- Log -----------------------------------------------------------------
commit 906ef4b28c376254743f948808e8ae47bb6f0a01
Author: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>
Date:   Wed Sep 7 14:15:35 2011 -0400

    Bug 6854: Correct a double password encryption problem in import_borrowers.pl
    
    When the CSV file has no password column and no default value was set for
    the password :
    If we try to modify an existing user, the password from the BD is sent
    to ModMember, which then encrypts the already-encrypted password a
    second time.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6854
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Confirmed bug on current master.
    1) Import new patron with password provided
    > OPAC login works
    2) Overwrite patron record, password provided
    > OPAC login works
    3) Overwrite patron record, password not provided
    Before patch: OPAC login broken, password in database changed
    After patch: OPC login works with same password as before
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:48:57 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:48:57 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-778-g906ef4b
Message-ID: <E1RGurY-0007JN-Tk@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  906ef4b28c376254743f948808e8ae47bb6f0a01 (commit)
      from  a7ee2993f02fb45f704c92ffdc49f840e05f5bd0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 tools/import_borrowers.pl |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:58:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:58:32 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_6483
	created. v3.04.00-779-g4a2a95c
Message-ID: <E1RGv0q-0007Lz-Li@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/enh/bug_6483 has been created
        at  4a2a95cc254f0ed1d5fcd6ea7084a5b08ef04952 (commit)

- Log -----------------------------------------------------------------
commit 4a2a95cc254f0ed1d5fcd6ea7084a5b08ef04952
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date:   Fri May 27 11:12:52 2011 +0200

    Bug 6483 - Paging in opac-detail when coming from a search
    
    Add paging in opac-detail when coming from a search to be
    able to continue viewing the previous and next register
    from the detail without returning to the results.
    The partial list pagination can be showed to increase forwarding
    or rewinding in the pagination.
    It's implemented for Zebra search and not build_grouped_results.
    
    The param busc with all the information from the search is stored
    on the session when running opac-search and opac-detail, outside these
    pages the busc param is removed from the session.
    
    A list of the biblionumbers inside the OPACnumSearchResults range
    is passed to avoid repeating the searching everytime we see the
    previous or next biblio. The searching will be run again when
    we are going to exceed the list and a new one will be calculated
    from the new search.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Oct 20 17:59:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Oct 2011 15:59:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-779-g4a2a95c
Message-ID: <E1RGv1e-0007Ml-8C@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  4a2a95cc254f0ed1d5fcd6ea7084a5b08ef04952 (commit)
      from  906ef4b28c376254743f948808e8ae47bb6f0a01 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 C4/Auth.pm                                         |    5 +
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |  162 +++++++++++-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |  176 ++++++++++++
 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif  |  Bin 0 -> 58 bytes
 opac/opac-detail.pl                                |  284 +++++++++++++++++++-
 opac/opac-search.pl                                |   37 +++
 6 files changed, 662 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 C4/Auth.pm
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/css/opac.css
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
 mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
 create mode 100644 koha-tmpl/opac-tmpl/prog/images/ico_b_results.gif


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 17:09:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 15:09:30 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7060
	updated. v3.04.00-775-gc5bc35b
Message-ID: <E1RHGiw-0004Cm-DK@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_7060 has been updated
       via  c5bc35b6945a03e27dd369d368be33d97f76e509 (commit)
      from  769acee41ae258ea4efb0114eb7995736496a9cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5bc35b6945a03e27dd369d368be33d97f76e509
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 10:49:58 2011 -0400

    Bug 7060 Followup: AddReturn needs GetMemberDetails
    
    In my haste, I overlooked circ/returns.pl's need for borrower flags.  This patch
    changes back the call in AddReturn from GetMember to GetMemberDetails
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 17:09:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 15:09:55 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-781-gb6cc3ac
Message-ID: <E1RHGjL-0004De-51@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  b6cc3acdac69a762f6aafdcaaac52cd31a1a200d (commit)
       via  c5bc35b6945a03e27dd369d368be33d97f76e509 (commit)
      from  4a2a95cc254f0ed1d5fcd6ea7084a5b08ef04952 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b6cc3acdac69a762f6aafdcaaac52cd31a1a200d
Merge: 4a2a95c c5bc35b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 04:09:49 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_7060' into kcmaster

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 18:35:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 16:35:48 +0000
Subject: [koha-commits] main Koha release repository branch
	new/3_6_0_po_files created. v3.04.00-784-g69333c9
Message-ID: <E1RHI4R-0004VT-VB@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/3_6_0_po_files has been created
        at  69333c9f79bf2cb8ac4e58f46da714dca962a8ee (commit)

- Log -----------------------------------------------------------------
commit 69333c9f79bf2cb8ac4e58f46da714dca962a8ee
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 05:33:40 2011 +1300

    Moving po files to 3.6.0 filenames

commit 684dab675bb99117453b729330c5761f7893725f
Merge: b6cc3ac 019173a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 04:54:00 2011 +1300

    Merge remote-tracking branch 'tamil/3.6.0-translation' into new_po

commit 019173ad50dc1872426eb208c51ef9b36ed74db1
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Fri Oct 21 12:53:57 2011 +0200

    3.6.0 Translations update

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 18:37:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 16:37:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-784-g69333c9
Message-ID: <E1RHI6Q-0004Wf-9g@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  69333c9f79bf2cb8ac4e58f46da714dca962a8ee (commit)
       via  684dab675bb99117453b729330c5761f7893725f (commit)
       via  019173ad50dc1872426eb208c51ef9b36ed74db1 (commit)
      from  b6cc3acdac69a762f6aafdcaaac52cd31a1a200d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 misc/translator/LangInstaller.pm                   |    8 +-
 .../po/am-Ethi-i-opac-t-prog-v-3002000.po          |16773 ----
 .../po/am-Ethi-i-opac-t-prog-v-3006000.po          |16934 ++++
 .../po/am-Ethi-i-staff-t-prog-v-3002000.po         |82352 ----------------
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         |83589 ++++++++++++++++
 misc/translator/po/am-Ethi-pref.po                 |36424 +-------
 .../po/ar-Arab-i-opac-t-prog-v-3002000.po          |16903 ----
 .../po/ar-Arab-i-opac-t-prog-v-3006000.po          |17066 ++++
 .../po/ar-Arab-i-staff-t-prog-v-3002000.po         |93773 ------------------
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         |95952 ++++++++++++++++++
 misc/translator/po/ar-Arab-pref.po                 | 9910 +--
 .../translator/po/az-AZ-i-opac-t-prog-v-3002000.po |17023 ----
 .../translator/po/az-AZ-i-opac-t-prog-v-3006000.po |17184 ++++
 .../po/az-AZ-i-staff-t-prog-v-3002000.po           |96865 ------------------
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           |99775 +++++++++++++++++++
 misc/translator/po/az-AZ-pref.po                   |28510 +-----
 misc/translator/po/ben-i-opac-t-prog-v-3002000.po  |15751 ---
 misc/translator/po/ben-i-opac-t-prog-v-3006000.po  |15863 +++
 misc/translator/po/ben-i-staff-t-prog-v-3002000.po |82357 ----------------
 misc/translator/po/ben-i-staff-t-prog-v-3006000.po |83594 ++++++++++++++++
 misc/translator/po/ben-pref.po                     |55256 +----------
 ...02000.po => bg-Cyrl-i-opac-t-prog-v-3006000.po} |    0
 ...2000.po => bg-Cyrl-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/ca-VA-i-opac-t-prog-v-3002000.po |16872 ----
 .../translator/po/ca-VA-i-opac-t-prog-v-3006000.po |17031 ++++
 .../po/ca-VA-i-staff-t-prog-v-3002000.po           |82357 ----------------
 .../po/ca-VA-i-staff-t-prog-v-3006000.po           |83594 ++++++++++++++++
 misc/translator/po/ca-VA-pref.po                   |27852 +-----
 ...3002000.po => cs-CZ-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => cs-CZ-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/da-DK-i-opac-t-prog-v-3002000.po |17327 ----
 .../translator/po/da-DK-i-opac-t-prog-v-3006000.po |17509 ++++
 .../po/da-DK-i-staff-t-prog-v-3006000.po           |88689 +++++++++++++++++
 misc/translator/po/da-DK-pref.po                   |24975 +-----
 .../translator/po/de-DE-i-opac-t-prog-v-3002000.po |16884 ----
 .../translator/po/de-DE-i-opac-t-prog-v-3006000.po |16176 +++
 .../po/de-DE-i-staff-t-prog-v-3002000.po           |96311 ------------------
 .../po/de-DE-i-staff-t-prog-v-3006000.po           |94555 ++++++++++++++++++
 misc/translator/po/de-DE-pref.po                   |13884 +---
 .../translator/po/el-GR-i-opac-t-prog-v-3002000.po |17412 ----
 .../translator/po/el-GR-i-opac-t-prog-v-3006000.po |17617 ++++
 .../po/el-GR-i-staff-t-prog-v-3002000.po           |99986 -------------------
 .../po/el-GR-i-staff-t-prog-v-3006000.po           |102957 ++++++++++++++++++++
 misc/translator/po/el-GR-pref.po                   |22004 +----
 .../translator/po/en-GB-i-opac-t-prog-v-3002000.po |17334 ----
 .../translator/po/en-GB-i-opac-t-prog-v-3006000.po |17522 ++++
 .../po/en-GB-i-staff-t-prog-v-3002000.po           |96765 ------------------
 .../po/en-GB-i-staff-t-prog-v-3006000.po           |99502 +++++++++++++++++++
 misc/translator/po/en-GB-pref.po                   |45471 +--------
 .../translator/po/en-NZ-i-opac-t-prog-v-3002000.po |17303 ----
 .../translator/po/en-NZ-i-opac-t-prog-v-3006000.po |17543 ++++
 .../po/en-NZ-i-staff-t-prog-v-3002000.po           |93243 ------------------
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           |96134 ++++++++++++++++++
 misc/translator/po/en-NZ-pref.po                   |52022 +---------
 ...po => en-USACADEMIC-i-opac-t-prog-v-3006000.po} |    0
 .../translator/po/es-ES-i-opac-t-prog-v-3002000.po |16866 ----
 .../translator/po/es-ES-i-opac-t-prog-v-3006000.po |16308 ++++
 .../po/es-ES-i-staff-t-prog-v-3002000.po           |94312 ------------------
 .../po/es-ES-i-staff-t-prog-v-3006000.po           |98532 +++++++++++++++++++
 misc/translator/po/es-ES-pref.po                   |62081 +-----------
 misc/translator/po/eu-i-opac-t-prog-v-3006000.po   |15855 +++
 misc/translator/po/eu-pref.po                      | 3692 +
 ...02000.po => fa-Arab-i-opac-t-prog-v-3006000.po} |    0
 .../translator/po/fi-FI-i-opac-t-prog-v-3002000.po |18640 ----
 .../translator/po/fi-FI-i-opac-t-prog-v-3006000.po |16233 +++
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           |83989 ++++++++++++++++
 misc/translator/po/fi-FI-pref.po                   |45728 +--------
 .../translator/po/fr-CA-i-opac-t-prog-v-3002000.po |17255 ----
 .../translator/po/fr-CA-i-opac-t-prog-v-3006000.po |16278 ++++
 .../po/fr-CA-i-staff-t-prog-v-3002000.po           |96170 ------------------
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           |86926 +++++++++++++++++
 misc/translator/po/fr-CA-pref.po                   |46288 +---------
 .../translator/po/fr-FR-i-opac-t-prog-v-3002000.po |16174 ---
 .../translator/po/fr-FR-i-opac-t-prog-v-3006000.po |16302 ++++
 .../po/fr-FR-i-staff-t-prog-v-3002000.po           |92702 ------------------
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           |87439 +++++++++++++++++
 misc/translator/po/fr-FR-pref.po                   |63938 +------------
 ...-v-3002000.po => gl-i-opac-t-prog-v-3006000.po} |    0
 ...02000.po => he-Hebr-i-opac-t-prog-v-3006000.po} |    0
 misc/translator/po/hi-i-opac-t-prog-v-3002000.po   |16776 ----
 misc/translator/po/hi-i-opac-t-prog-v-3006000.po   |16935 ++++
 misc/translator/po/hi-i-staff-t-prog-v-3002000.po  |93907 ------------------
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  |96815 ++++++++++++++++++
 misc/translator/po/hi-pref.po                      |28990 +-----
 .../translator/po/hr-HR-i-opac-t-prog-v-3002000.po |16627 ----
 .../translator/po/hr-HR-i-opac-t-prog-v-3006000.po |17102 ++++
 .../po/hr-HR-i-staff-t-prog-v-3002000.po           |82935 ----------------
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           |84226 ++++++++++++++++
 misc/translator/po/hr-HR-pref.po                   |18968 +----
 .../translator/po/hu-HU-i-opac-t-prog-v-3002000.po |17634 ----
 .../translator/po/hu-HU-i-opac-t-prog-v-3006000.po |17807 ++++
 .../po/hu-HU-i-staff-t-prog-v-3002000.po           |87285 -----------------
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           |88824 +++++++++++++++++
 misc/translator/po/hu-HU-pref.po                   | 1028 +-
 .../po/hy-Armn-i-opac-t-prog-v-3006000.po          |16348 ++++
 ...002000.po => hy-Armn-i-staff-prog-v-3006000.po} |    0
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         |86834 +++++++++++++++++
 misc/translator/po/hy-Armn-pref.po                 | 1242 +-
 .../translator/po/id-ID-i-opac-t-prog-v-3002000.po |16588 ----
 .../translator/po/id-ID-i-opac-t-prog-v-3006000.po |15789 +++
 .../po/id-ID-i-staff-t-prog-v-3006000.po           |83589 ++++++++++++++++
 misc/translator/po/id-ID-pref.po                   |30194 +------
 .../translator/po/is-IS-i-opac-t-prog-v-3006000.po |16848 ++++
 misc/translator/po/is-IS-pref.po                   | 3692 +
 .../translator/po/it-IT-i-opac-t-prog-v-3002000.po |16844 ----
 .../translator/po/it-IT-i-opac-t-prog-v-3006000.po |17037 ++++
 .../po/it-IT-i-staff-t-prog-v-3002000.po           |92374 ------------------
 .../po/it-IT-i-staff-t-prog-v-3006000.po           |96990 ++++++++++++++++++
 misc/translator/po/it-IT-pref.po                   |63084 +-----------
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3002000.po       |16889 ----
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po       |17039 ++++
 misc/translator/po/ja-Jpan-JP-pref.po              |41926 +--------
 ...2000.po => kn-Knda-i-staff-t-prog-v-3006000.po} |    0
 ...00.po => ko-Kore-KP-i-opac-t-prog-v-3006000.po} |    0
 .../po/lo-Laoo-i-opac-t-prog-v-3002000.po          |16102 ---
 .../po/lo-Laoo-i-opac-t-prog-v-3006000.po          |16582 ++++
 .../po/lo-Laoo-i-staff-t-prog-v-3002000.po         |82353 ----------------
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         |83590 ++++++++++++++++
 misc/translator/po/lo-Laoo-pref.po                 |52162 +----------
 .../translator/po/mi-NZ-i-opac-t-prog-v-3002000.po |16872 ----
 .../translator/po/mi-NZ-i-opac-t-prog-v-3006000.po |17031 ++++
 misc/translator/po/mi-NZ-pref.po                   |40274 +-------
 misc/translator/po/mon-i-opac-t-prog-v-3002000.po  |16862 ----
 misc/translator/po/mon-i-opac-t-prog-v-3006000.po  |17023 ++++
 misc/translator/po/mon-i-staff-t-prog-v-3002000.po |92325 ------------------
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po |94898 ++++++++++++++++++
 misc/translator/po/mon-pref.po                     |27142 +-----
 ...-v-3002000.po => mr-i-opac-t-prog-v-3006000.po} |    0
 ...v-3002000.po => mr-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/ms-MY-i-opac-t-prog-v-3002000.po |15665 ---
 .../translator/po/ms-MY-i-opac-t-prog-v-3006000.po |16088 +++
 .../po/ms-MY-i-staff-t-prog-v-3002000.po           |82405 ----------------
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           |83662 ++++++++++++++++
 misc/translator/po/ms-MY-pref.po                   |15698 +---
 .../translator/po/nb-NO-i-opac-t-prog-v-3002000.po |12635 ---
 .../translator/po/nb-NO-i-opac-t-prog-v-3006000.po |16288 ++++
 .../po/nb-NO-i-staff-t-prog-v-3002000.po           |64439 ------------
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           |86103 ++++++++++++++++
 misc/translator/po/nb-NO-pref.po                   |20390 +----
 ...3002000.po => ne-NE-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => ne-NE-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/nl-BE-i-opac-t-prog-v-3002000.po |17351 ----
 .../translator/po/nl-BE-i-opac-t-prog-v-3006000.po |17552 ++++
 .../po/nl-BE-i-staff-t-prog-v-3002000.po           |82475 ----------------
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           |83768 ++++++++++++++++
 misc/translator/po/nl-BE-pref.po                   | 6883 +-
 .../translator/po/nl-NL-i-opac-t-prog-v-3002000.po |16955 ----
 .../translator/po/nl-NL-i-opac-t-prog-v-3006000.po |17118 ++++
 .../po/nl-NL-i-staff-t-prog-v-3002000.po           |82376 ----------------
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           |83613 ++++++++++++++++
 misc/translator/po/nl-NL-pref.po                   |35582 +-------
 .../translator/po/nn-NO-i-opac-t-prog-v-3002000.po | 8957 --
 .../translator/po/nn-NO-i-opac-t-prog-v-3006000.po |15972 +++
 ...-3002000.po => nn-NO-i-staff-prog-v-3006000.po} |    0
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           |85655 ++++++++++++++++
 misc/translator/po/nn-NO-pref.po                   |53558 +----------
 ...v-3002000.po => pbr-i-opac-t-prog-v-3006000.po} |    0
 ...-3002000.po => pbr-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/pl-PL-i-opac-t-prog-v-3002000.po |17234 ----
 .../translator/po/pl-PL-i-opac-t-prog-v-3006000.po |17446 ++++
 .../po/pl-PL-i-staff-t-prog-v-3002000.po           |88679 -----------------
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           |90364 +++++++++++++++++
 misc/translator/po/pl-PL-pref.po                   |56358 +----------
 ...v-3002000.po => prs-i-opac-t-prog-v-3006000.po} |    0
 ...-3002000.po => prs-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/pt-BR-i-opac-t-prog-v-3002000.po |17625 ----
 .../translator/po/pt-BR-i-opac-t-prog-v-3006000.po |17850 ++++
 .../po/pt-BR-i-staff-t-prog-v-3002000.po           |84737 ----------------
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           |91330 +++++++++++++++++
 misc/translator/po/pt-BR-pref.po                   |49599 +---------
 .../translator/po/pt-PT-i-opac-t-prog-v-3002000.po |17865 ----
 .../translator/po/pt-PT-i-opac-t-prog-v-3006000.po |18026 ++++
 .../po/pt-PT-i-staff-t-prog-v-3002000.po           |98447 -------------------
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           |101430 +++++++++++++++++++
 misc/translator/po/pt-PT-pref.po                   |50190 +---------
 .../translator/po/ro-RO-i-opac-t-prog-v-3002000.po |16943 ----
 .../translator/po/ro-RO-i-opac-t-prog-v-3006000.po |17101 ++++
 .../po/ro-RO-i-staff-t-prog-v-3002000.po           |87163 -----------------
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           |89092 +++++++++++++++++
 misc/translator/po/ro-RO-pref.po                   |  184 +-
 .../translator/po/ru-RU-i-opac-t-prog-v-3002000.po |17238 ----
 .../translator/po/ru-RU-i-opac-t-prog-v-3006000.po |16432 ++++
 .../po/ru-RU-i-staff-t-prog-v-3002000.po           |94618 ------------------
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           |86558 ++++++++++++++++
 misc/translator/po/ru-RU-pref.po                   | 3878 +-
 .../translator/po/sd-PK-i-opac-t-prog-v-3002000.po |15712 ---
 .../translator/po/sd-PK-i-opac-t-prog-v-3006000.po |15816 +++
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           |83589 ++++++++++++++++
 misc/translator/po/sd-PK-pref.po                   |38374 +-------
 ...3002000.po => sk-SK-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => sk-SK-i-staff-t-prog-v-3006000.po} |    0
 ...3002000.po => sl-SI-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => sl-SI-i-staff-t-prog-v-3006000.po} |    0
 ...3002000.po => sq-AL-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => sq-AL-i-staff-t-prog-v-3006000.po} |    0
 ...02000.po => sr-Cyrl-i-opac-t-prog-v-3006000.po} |    0
 .../po/sr-Cyrl-i-staff-t-prog-v-3002000.po         |82352 ----------------
 ...2000.po => sr-Cyrl-i-staff-t-prog-v-3006000.po} |    0
 .../translator/po/sv-SE-i-opac-t-prog-v-3002000.po |17106 ----
 .../translator/po/sv-SE-i-opac-t-prog-v-3006000.po |17264 ++++
 .../po/sv-SE-i-staff-t-prog-v-3002000.po           |82404 ----------------
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           |83652 ++++++++++++++++
 misc/translator/po/sv-SE-pref.po                   | 3692 +
 ...3002000.po => ta-LK-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => ta-LK-i-staff-t-prog-v-3006000.po} |    0
 misc/translator/po/tet-i-opac-t-prog-v-3002000.po  |17341 ----
 misc/translator/po/tet-i-opac-t-prog-v-3006000.po  |17553 ++++
 misc/translator/po/tet-i-staff-t-prog-v-3002000.po |87128 -----------------
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po |89025 +++++++++++++++++
 misc/translator/po/tet-pref.po                     |12364 +---
 .../po/th-THA-i-opac-t-prog-v-3002000.po           |17188 ----
 .../po/th-THA-i-opac-t-prog-v-3006000.po           |17348 ++++
 .../po/th-THA-i-staff-t-prog-v-3002000.po          |82355 ----------------
 .../po/th-THA-i-staff-t-prog-v-3006000.po          |83597 ++++++++++++++++
 misc/translator/po/th-THA-pref.po                  | 5532 +-
 ...3002000.po => tl-PH-i-opac-t-prog-v-3006000.po} |    0
 .../translator/po/tr-TR-i-opac-t-prog-v-3002000.po |17354 ----
 .../translator/po/tr-TR-i-opac-t-prog-v-3006000.po |17515 ++++
 .../po/tr-TR-i-staff-t-prog-v-3002000.po           |97316 ------------------
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           |100256 +++++++++++++++++++
 misc/translator/po/tr-TR-pref.po                   | 2794 +-
 .../translator/po/uk-UA-i-opac-t-prog-v-3002000.po |17249 ----
 .../translator/po/uk-UA-i-opac-t-prog-v-3006000.po |16435 ++++
 .../po/uk-UA-i-staff-t-prog-v-3002000.po           |98957 -------------------
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           |87957 +++++++++++++++++
 misc/translator/po/uk-UA-pref.po                   |17912 +---
 .../po/ur-Arab-i-opac-t-prog-v-3002000.po          |15762 ---
 .../po/ur-Arab-i-opac-t-prog-v-3006000.po          |15874 +++
 .../po/ur-Arab-i-staff-t-prog-v-3002000.po         |82353 ----------------
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         |83590 ++++++++++++++++
 misc/translator/po/ur-Arab-pref.po                 |25672 +-----
 ...3002000.po => vi-VN-i-opac-t-prog-v-3006000.po} |    0
 ...002000.po => vi-VN-i-staff-t-prog-v-3006000.po} |    0
 .../po/zh-Hans-CN-i-opac-t-prog-v-3002000.po       |17216 ----
 .../po/zh-Hans-CN-i-opac-t-prog-v-3006000.po       |17377 ++++
 .../po/zh-Hans-CN-i-staff-t-prog-v-3002000.po      |95945 ------------------
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      |98286 +++++++++++++++++++
 misc/translator/po/zh-Hans-CN-pref.po              |39270 +-------
 .../po/zh-Hans-TW-i-opac-t-prog-v-3002000.po       |17463 ----
 .../po/zh-Hans-TW-i-opac-t-prog-v-3006000.po       |16099 +++
 .../po/zh-Hans-TW-i-staff-t-prog-v-3002000.po      |93779 ------------------
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      |87086 +++++++++++++++++
 misc/translator/po/zh-Hans-TW-pref.po              |45008 +--------
 243 files changed, 4539252 insertions(+), 5135023 deletions(-)
 delete mode 100644 misc/translator/po/am-Ethi-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/am-Ethi-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/am-Ethi-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/am-Ethi-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ar-Arab-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ar-Arab-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ar-Arab-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ar-Arab-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/az-AZ-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/az-AZ-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/az-AZ-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/az-AZ-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ben-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ben-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ben-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ben-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{bg-Cyrl-i-opac-t-prog-v-3002000.po => bg-Cyrl-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{bg-Cyrl-i-staff-t-prog-v-3002000.po => bg-Cyrl-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/ca-VA-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ca-VA-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ca-VA-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ca-VA-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{cs-CZ-i-opac-t-prog-v-3002000.po => cs-CZ-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{cs-CZ-i-staff-t-prog-v-3002000.po => cs-CZ-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/da-DK-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/da-DK-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/da-DK-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/de-DE-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/de-DE-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/de-DE-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/de-DE-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/el-GR-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/el-GR-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/el-GR-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/el-GR-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/en-GB-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/en-GB-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/en-GB-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/en-GB-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/en-NZ-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/en-NZ-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/en-NZ-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/en-NZ-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{en-USACADEMIC-i-opac-t-prog-v-3002000.po => en-USACADEMIC-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/es-ES-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/es-ES-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/es-ES-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/es-ES-i-staff-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/eu-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/eu-pref.po
 rename misc/translator/po/{fa-Arab-i-opac-t-prog-v-3002000.po => fa-Arab-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/fi-FI-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/fi-FI-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/fi-FI-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/fr-CA-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/fr-CA-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/fr-CA-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/fr-CA-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/fr-FR-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/fr-FR-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/fr-FR-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/fr-FR-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{gl-i-opac-t-prog-v-3002000.po => gl-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{he-Hebr-i-opac-t-prog-v-3002000.po => he-Hebr-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/hi-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hi-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/hi-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hi-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/hr-HR-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hr-HR-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/hr-HR-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hr-HR-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/hu-HU-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hu-HU-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/hu-HU-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/hu-HU-i-staff-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/hy-Armn-i-opac-t-prog-v-3006000.po
 rename misc/translator/po/{hy-Armn-i-staff-prog-v-3002000.po => hy-Armn-i-staff-prog-v-3006000.po} (100%)
 create mode 100644 misc/translator/po/hy-Armn-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/id-ID-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/id-ID-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/id-ID-i-staff-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/is-IS-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/is-IS-pref.po
 delete mode 100644 misc/translator/po/it-IT-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/it-IT-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/it-IT-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/it-IT-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ja-Jpan-JP-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po
 rename misc/translator/po/{kn-Knda-i-staff-t-prog-v-3002000.po => kn-Knda-i-staff-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{ko-Kore-KP-i-opac-t-prog-v-3002000.po => ko-Kore-KP-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/lo-Laoo-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/lo-Laoo-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/lo-Laoo-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/lo-Laoo-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/mi-NZ-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/mi-NZ-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/mon-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/mon-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/mon-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/mon-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{mr-i-opac-t-prog-v-3002000.po => mr-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{mr-i-staff-t-prog-v-3002000.po => mr-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/ms-MY-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ms-MY-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ms-MY-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ms-MY-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nb-NO-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nb-NO-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nb-NO-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nb-NO-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{ne-NE-i-opac-t-prog-v-3002000.po => ne-NE-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{ne-NE-i-staff-t-prog-v-3002000.po => ne-NE-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/nl-BE-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nl-BE-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nl-BE-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nl-BE-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nl-NL-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nl-NL-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nl-NL-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nl-NL-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/nn-NO-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/nn-NO-i-opac-t-prog-v-3006000.po
 rename misc/translator/po/{nn-NO-i-staff-prog-v-3002000.po => nn-NO-i-staff-prog-v-3006000.po} (100%)
 create mode 100644 misc/translator/po/nn-NO-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{pbr-i-opac-t-prog-v-3002000.po => pbr-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{pbr-i-staff-t-prog-v-3002000.po => pbr-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/pl-PL-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pl-PL-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/pl-PL-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pl-PL-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{prs-i-opac-t-prog-v-3002000.po => prs-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{prs-i-staff-t-prog-v-3002000.po => prs-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/pt-BR-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pt-BR-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/pt-BR-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pt-BR-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/pt-PT-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pt-PT-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/pt-PT-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/pt-PT-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ro-RO-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ro-RO-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ro-RO-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ro-RO-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ru-RU-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ru-RU-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ru-RU-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ru-RU-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/sd-PK-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/sd-PK-i-opac-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/sd-PK-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{sk-SK-i-opac-t-prog-v-3002000.po => sk-SK-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sk-SK-i-staff-t-prog-v-3002000.po => sk-SK-i-staff-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sl-SI-i-opac-t-prog-v-3002000.po => sl-SI-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sl-SI-i-staff-t-prog-v-3002000.po => sl-SI-i-staff-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sq-AL-i-opac-t-prog-v-3002000.po => sq-AL-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sq-AL-i-staff-t-prog-v-3002000.po => sq-AL-i-staff-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{sr-Cyrl-i-opac-t-prog-v-3002000.po => sr-Cyrl-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/sr-Cyrl-i-staff-t-prog-v-3002000.po
 rename misc/translator/po/{sd-PK-i-staff-t-prog-v-3002000.po => sr-Cyrl-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/sv-SE-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/sv-SE-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/sv-SE-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/sv-SE-i-staff-t-prog-v-3006000.po
 create mode 100644 misc/translator/po/sv-SE-pref.po
 rename misc/translator/po/{ta-LK-i-opac-t-prog-v-3002000.po => ta-LK-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{ta-LK-i-staff-t-prog-v-3002000.po => ta-LK-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/tet-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/tet-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/tet-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/tet-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/th-THA-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/th-THA-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/th-THA-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/th-THA-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{tl-PH-i-opac-t-prog-v-3002000.po => tl-PH-i-opac-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/tr-TR-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/tr-TR-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/tr-TR-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/tr-TR-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/uk-UA-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/uk-UA-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/uk-UA-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/uk-UA-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ur-Arab-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ur-Arab-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/ur-Arab-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/ur-Arab-i-staff-t-prog-v-3006000.po
 rename misc/translator/po/{vi-VN-i-opac-t-prog-v-3002000.po => vi-VN-i-opac-t-prog-v-3006000.po} (100%)
 rename misc/translator/po/{vi-VN-i-staff-t-prog-v-3002000.po => vi-VN-i-staff-t-prog-v-3006000.po} (100%)
 delete mode 100644 misc/translator/po/zh-Hans-CN-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/zh-Hans-CN-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/zh-Hans-CN-i-staff-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-i-opac-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/zh-Hans-TW-i-opac-t-prog-v-3006000.po
 delete mode 100644 misc/translator/po/zh-Hans-TW-i-staff-t-prog-v-3002000.po
 create mode 100644 misc/translator/po/zh-Hans-TW-i-staff-t-prog-v-3006000.po


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 19:32:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 17:32:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5995
	updated. v3.04.00-40-g8d7608c
Message-ID: <E1RHIxO-0004jW-0u@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, new/bug_5995 has been updated
       via  8d7608cd64a74d3513fb618d39a5a0f414fdf6a3 (commit)
      from  dcb4ac77fbfd813cc0eb39e060b49a7b8d491016 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8d7608cd64a74d3513fb618d39a5a0f414fdf6a3
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 10:18:14 2011 -0400

    Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
    
    The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
    was improperly scoped with 'my' inside a conditional.  The changes followup to 5995
    made this more apparent, causing logins to fail.
    
    Also added "parts copyright" statement to the script, since ByWater Solutions did make some
    significant contributions to the operations of the page
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 opac/sco/sco-main.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 19:38:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 17:38:24 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-786-gc8df6bd
Message-ID: <E1RHJ32-0004mh-Li@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  c8df6bdcc9fe2523a77c839270b31304d8e13ee5 (commit)
       via  8d7608cd64a74d3513fb618d39a5a0f414fdf6a3 (commit)
      from  69333c9f79bf2cb8ac4e58f46da714dca962a8ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c8df6bdcc9fe2523a77c839270b31304d8e13ee5
Merge: 69333c9 8d7608c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 06:36:36 2011 +1300

    Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
    
    Conflicts:
    	opac/sco/sco-main.pl

-----------------------------------------------------------------------

Summary of changes:
 opac/sco/sco-main.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 22:12:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 20:12:37 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-790-gd89eb95
Message-ID: <E1RHLSH-0005JV-0g@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  d89eb95b0be7d1b3d58555b1af305bb717e34822 (commit)
       via  55306b9267f3ec9a2fec29e2ae1679ce69e25240 (commit)
       via  d52095b48c9ef2a7249d367554da07277dd7bd09 (commit)
       via  0953e8ca09d8f6010991523c2713e4546b12d907 (commit)
      from  c8df6bdcc9fe2523a77c839270b31304d8e13ee5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d89eb95b0be7d1b3d58555b1af305bb717e34822
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 09:12:15 2011 +1300

    Updating distro specific install files

commit 55306b9267f3ec9a2fec29e2ae1679ce69e25240
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 09:04:19 2011 +1300

    Updating main INSTALL instructions

commit d52095b48c9ef2a7249d367554da07277dd7bd09
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 14:41:03 2011 -0400

    Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
    
    Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).
    
    To test:
    
    On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u
    
    Shouldn't return anything about HTML::Template::Pro
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0953e8ca09d8f6010991523c2713e4546b12d907
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 14:16:51 2011 -0400

    Bug 7063: add available perl packages for Debian in install_misc/debian.packages
    
    Takes work done by Eduardo Tr?pani, alphabetizes, and adds two other packages:
    
    libuniversal-require-perl
    libgravatar-url-perl
    
    From my testing, only CGI::Session::Driver::memcached remains missing; it is only
    packaged for sid and wheezy at this time
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 C4/Installer/PerlDependencies.pm |    5 -----
 INSTALL                          |   11 ++++++-----
 INSTALL.debian                   |    5 +++--
 INSTALL.ubuntu                   |    5 +++--
 INSTALL.ubuntu.lucid             |    5 +++--
 install_misc/debian.packages     |   28 ++++++++++++++++++++++++++++
 6 files changed, 43 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Oct 21 23:26:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Oct 2011 21:26:40 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.04.00-792-g52c666e
Message-ID: <E1RHMbw-0005YH-Ki@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  52c666edce4261a1acafaa34b2c8a2431589ac0c (commit)
       via  f4d9b8e9dc261f92eb792e04e5b8994657f58d8d (commit)
      from  d89eb95b0be7d1b3d58555b1af305bb717e34822 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52c666edce4261a1acafaa34b2c8a2431589ac0c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 10:26:13 2011 +1300

    Updating version number for release

commit f4d9b8e9dc261f92eb792e04e5b8994657f58d8d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 22 10:24:05 2011 +1300

    Release notes for 3.6.0

-----------------------------------------------------------------------

Summary of changes:
 installer/data/mysql/updatedatabase.pl     |    5 +
 kohaversion.pl                             |    2 +-
 misc/release_notes/release_notes_3_6_0.txt |  326 ++++++++++++++++++++++++++++
 3 files changed, 332 insertions(+), 1 deletions(-)
 create mode 100644 misc/release_notes/release_notes_3_6_0.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Oct 22 18:18:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 22 Oct 2011 16:18:28 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.06.00
	created. v3.06.00
Message-ID: <E1RHeHE-0001Gu-5h@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The annotated tag, v3.06.00 has been created
        at  9a3e949d5d6003f6eeaf083e49bda3c254964420 (tag)
   tagging  52c666edce4261a1acafaa34b2c8a2431589ac0c (commit)
  replaces  v3.04.00
 tagged by  Chris Cormack
        on  Sun Oct 23 05:17:52 2011 +1300

- Log -----------------------------------------------------------------
Koha 3.6.0 release
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEABECAAYFAk6i7LAACgkQZgbcHEvgMLPBUgCfb/HDI6tjkSvlWCJNECmjsckY
1/AAn3/Net1gzq5udNSIDU0Y/hefI732
=yatI
-----END PGP SIGNATURE-----

Alex Arnaud (6):
      Bug #6131 - change index "Author-name-personal" for "Personal-name"
      Bug #6057 - Improve finding next stock number
      Bug #6068 - New feature: capability to blanking subfields in BatchMod
      bug 4966: Add a button in parcel.pl for confirm end receiving
      Bug 4966 - follow up - add xhtml closure for input tags
      Bug 6755 follow up

Amit Gupta (3):
      Bug 6761 - Longer userid field
      Bug 6776 - Add Checkin tab to patron search tool
      Bug 6807 - Add ISBN filter to advanced order search.

Brett Wilkins (1):
      bug 6724: enable decimals on values greater than 1

Brice Sanchez (1):
      Bug 5713 :debug calculation when fines are reversed then re-payed

Chris Cormack (173):
      Bumping the database number
      Bug 6143 : Fixing missing sysprefs
      Bug 6033 : Template changes
      Merge remote branch 'kc/new/enh/bug_6143' into kcmaster
      Bug 6033 : Follow up fix for bug that crept in with conversion to template toolkit
      Merge remote branch 'kc/new/enh/bug_6033' into kcmaster
      Rewriting the valid templates test to test template toolkit
      Fixing a template error
      Bug 6031 : Fix for syntax (bashism crept into a pure sh script)
      Merge remote-tracking branch 'kc/new/bug_5449' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6312' into kcmaster
      Bug 6350 : Updating history docs
      Merge remote-tracking branch 'kc/new/enh/bug_5579' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6170' into kcmaster
      Bug 6347 - Fix for itemlevel holds in OPAC
      Updating about page
      Bug 6429 : Fixing numbering of developers
      Merge remote-tracking branch 'kc/master' into new/bug_5683
      Fixing permissions, no need for this file to be executable
      Merge remote-tracking branch 'kc/new/bug_5683' into kcmaster
      Bug 5918 : Use the default messaging preferences if the user does not select any
      Bug 6350 - Keeping history page up to date
      Bug 6350 Adding Fridolyn Somers to the history
      Merge remote-tracking branch 'kc/new/bug_5868' into kcmaster
      Updating upgrade information to note the fact language templates need
      Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster
      Bumping database number
      Bug 5714 follow up removing the debugging message
      Merge remote-tracking branch 'kc/new/bug_5094' into kcmaster
      Bug 6350 : Updating history
      Bug 6518 : Fixing XSS issues on opac
      Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster
      Bug 5199 : Adding a syspref to control recording of branch code in OPAC renewals
      Bug 5199 : Followup patch, fixing a bug with NULL option
      Bumping database version number
      Bumping database version
      Bug 6350 Updating history
      Merge remote-tracking branch 'kc/master' into new/bug_6350
      Merge remote-tracking branch 'kc/new/bug_2505' into kcmaster
      Bug 4330 : Updating copyright statements
      Bug 4330 : Updating copyright statements for about.pl
      Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster
      Fixing missing padding on module version
      Merge remote-tracking branch 'kc/new/enh/bug_5917' into kcmaster
      Bug 6611 : With the change to making cardnumber a nullable field, we need to pass it around when we are updating borrowers, to make sure we don't null it
      Bug 6350: History update
      Merge remote-tracking branch 'kc/new/bug_6521' into kcmaster
      Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster
      Bug 6642 : Making sure permissions are checked on label creator
      Bug 5009 : Turning off autocomplete
      Bumping database version
      Bumping database version
      Fixing a little style edit, so Perl::Critic won't complain
      Bug 5429 : Open Library book covers
      Bug 5429 : Covers for detail page and database update
      Bumping database version
      Bug 5072 : Template changes
      Bumping database version
      Fix for a typo I made in the build script
      Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster
      Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster
      Bug 5630 CAS improvements
      Updating history
      Adding the 149th developer to the history
      Bug 6553 : Fixing authentication issue, there is no reason we should be able to use these without authentication
      Bug 6553 : Follow up adding license statements
      Bug 6713, editing matching rules broken
      Merge remote-tracking branch 'kc/new/bug_6476' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_4002' into kcmaster
      Bumping database version
      Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6678' into kcmaster
      Bug 6703 : Link to invoice broken
      Merge remote-tracking branch 'kc/new/enh/bug_6540' into kcmaster
      Fixing executable bit on koha-httpd.conf
      Merge remote-tracking branch 'kc/new/bug_5498' into kcmaster
      150th developer!!!
      Fixing typo in history doc
      Merge remote-tracking branch 'kc/new/bug_6726' into kcmaster
      Bug 6748 - Add link to fast add framework while circulating, if a barcode is not found
      Merge remote-tracking branch 'kc/new/bug_6753' into kcmaster
      Bug 5866 : Updated patch to speed up holds awaiting pickup
      Bumping database version
      Merge branch 'new/bug_4330' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6696' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6712' into kcmaster
      Updating about page and history
      Bug 6528 : Cataloguing search not showing location for available items
      Bug 5524 : Cant delete list from the second page of lists
      Bug 6656 : Fix for advanced search not respecting default sort order
      Bug 6704 : Escaping html in the merging records, so " don't break the merge
      Merge remote-tracking branch 'kc/new/bug_6351' into kcmaster
      Revert "Bug 5630 CAS improvements"
      Merge branch 'new/bug_6479' into kcmaster
      Bug 6834 : Removing last of the $template->{param_map}
      Updating history and about file
      Updating about file and history doc
      Bug 6732 : Showing the bibliographic title on the manual invoices line
      Bug 6555 : only 10 lists show in the staff client
      Bug 6665 : TT problem was preventing AdvancedMARCEditor pref from working when cataloguing
      Follow up for 6665 : Fixing the hide_marc pref also
      Merge remote-tracking branch 'kc/new/bug_6256' into kcmaster
      Bumpding database version
      Merge remote-tracking branch 'kc/new/bug_6863' into kcmaster
      While testing the commits for 6716 I discovered a couple of missing
      Merge remote-tracking branch 'kc/master' into new/enh/bug_6716
      Adding the 155th developer to the history
      Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
      Bug 6716 couple of little typos
      Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
      Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
      Bug 5675 : CheckReserves not honouring item level itemtypes preferences
      Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
      Bug 6881 - Not able to accept a suggestion (typo in template)
      Bug 6755 follow up, fixing broken POD
      Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
      Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
      Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster
      Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster
      Fixing a bug in the templates that will break translation
      Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster
      Fixing a broken test
      Adding new developer to history
      Bug 6755 Follow up, fixing broken call to themelanguage
      Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
      Bug 6755 : Fixing a bug with guided reports
      Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
      Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
      Merge remote-tracking branch 'kc/new/enh/bug_6871' into kcmaster
      Updating history and about file
      Merge remote-tracking branch 'kc/new/enh/bug_5263' into kcmaster
      Bug 6958 : Fix for leading spaces being stripped on translation
      Database version bumped
      Bumping database version
      Bumping database version
      Fixing line endings
      Bumping database version to 3.05.00.015
      Bug 5459 - Holds not being shifted when merging biblios
      Bumping db version
      Bug 5630 CAS improvements
      Bug 6885 Follow up to fix superlibarian permission check
      Bug 6519 : Changing analytic searches from Title: to ti,phr
      Bug 5780 - Export the URI as part of a RIS export
      Bumping database version
      Bumping database version
      Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
      Adding another developer to the history
      Merge remote-tracking branch 'kc/new/bug_6390' into kcmaster
      Bumping database version
      Updating perl version required to match reality
      Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster
      Bug 6972 : Followup fixing bad indentation
      Bug 5436, adding updatedatabase.pl
      Bumping db version
      Merge remote-tracking branch 'kc/new/bug_6253' into kcmaster
      Bumping database version
      Bumping database version
      Merge remote-tracking branch 'kc/new/bug_6094' into kcmaster
      Merge remote-tracking branch 'kc/new/bug_7060' into kcmaster
      Merge remote-tracking branch 'tamil/3.6.0-translation' into new_po
      Moving po files to 3.6.0 filenames
      Merge remote-tracking branch 'kc/new/bug_5995' into kcmaster
      Updating main INSTALL instructions
      Updating distro specific install files
      Release notes for 3.6.0
      Updating version number for release

Chris Nighswonger (4):
      Bug 2246 - (Partial) Label printing doesn't work with Unicode characters
      Bug 5379 - import_borrowers.pl fails with db insert/update errors
      Bug 5263 - Add support for including fields from the ISSUES table in advanced due notices
      Bug 6269 - can't undefine a printer profile

Christophe Croullebois (4):
      Bug 6116: Adding a child patron
      Bug 6121: Holds awaiting pickup
      Bug 5680: Order cancelling improvement : delete attached items & biblio if avalaible
      Bug 5680: Follow Up for Order cancelling improvement : the same for parcel.pl

Colin Campbell (24):
      Bug 6194 Suppress punctuation when no location
      Bug 6282: HomeOrHoldingBranchReturn missing from pref file
      Bug 6315: Fix depreciated constructions in C4::Serials
      Remove a typo from serials-edit template
      Bug 6050 Make calls to GetItemsInfo consistent
      Bug 2505: Suppress some warnings emitted by members-home.pl
      Bug 5453 Do not declare variables in conditionals
      Bug 5453: Move declarations out of conditionals
      Bug 5453: Move declarations from within conditionals in catalogue/search.pl
      Bug 5453 Move declarations out of conditionals
      Bug 5453 Move declarations out of conditionals in opac
      Bug 5453 Move declarations out of conditionals
      Bug 5453 : Move declarations out of conditionals
      Bug 6598 : ensure OPACFineRenewals can prevent opac renewals
      Bug 6311 check_inst_id was being passed non-existent value
      Bug 6280 : Don't generate invalid SQL in GetPendingIssues
      Bug 6181: Remove CGI Scolling lists from C4::Budgets
      Bug 6562: Silence runtime error in reserve/request.pl
      Bug 6733 - Change return page after printing routing slip
      Bug 5605 [ENH] SIP: Add Support for the Fee Paid Message
      Bug 3498 [ENH] Allow Partial Payment of Fines
      Bug 6620 Ensure autoflush is set on output filehandles
      Bug 6667 Correct documentation of function
      Bug 6806 Fix encoding of title in subscription-add

D Ruth Bavousett (4):
      Bug 6351: Unable to delete branch-specific circulation rule
      Bug 6900 - line break between available and reference items
      Bug 6867: Date last seen ignored on import
      Bug 6572: Script batch anonymisation wrapper

Dobrica Pavlinusic (2):
      Bug 4993 checkpw_ldap - do bind just once
      Bug 4994 - Net::LDAP returns lowercase names

Elliott Davis (2):
      Bug 6437: Added div with id yui-main around advsearch form
      Bug 6491 Added: id in opac-privacy around the privacy policy div container Testing: An ID should appear in the container for the privacy rules saying userprivacy

Francois Marier (5):
      Bug 6298 : Add avatar picture of comment author in OPAC
      Bug 6298 : Show avatars on the recent comments page
      Bug 6298 : Hide avatars when ShowReviewer is off
      Bug 6298 : Create new ShowReviewerPhoto preference
      Bug 6298 : Add optional dependency on Gravatar::URL 1.03

Fridolyn SOMERS (7):
      Bug 5658 can't delete subfields in frameworks
      BUG6091 Remove undeclared syspref OPACAdvSearchInputCount
      BUG6436 Don't allow deletion of an itemtype used in items.itype
      BUG6067 When Add Duplicate changing framework would loose data
      BUG 6388 Broken pager images in branch_transfer_limits.tt
      BUG6389 Administration menu like Tools menu
      BUG4319 waiting items cannot be reserved

Fr?re S?bastien Marie (5):
      Bug 6452 : Use placeholders in sql but makepayment seems dead code ?
      Bug 6452: Use placeholders in sql
      Bug 6549 : sco-main.pl: Parentheses missing around "my" list
      Bug 6632 [Signed Off] add html filter to prevent XSS
      Bug 5131 :restrict use of sort_by value to allowed values

Fr?d?ric Demians (23):
      Bug 6320 Generate Next button doesn't generate next issue
      Improve error message when translation installation fails
      Bug 6342 Help link doesn't popup anymore contextual help page
      Bug 6464 Check inconsistent placeholders in translated strings
      Bug 6050 Followup, edit a last function call
      Bug 6150 UNIMARC field 225 plugin: allow $a value data entry
      Bug 6458 Template Toolkit files test case
      Bug 6750 Guarantor search broken on translated templates
      Bug 6679 Followup for acqui/histsearch.pl
      Bug 6755 Problems with switching languages
      Bug 6649 Allow help screens editing
      Bug 6755 Web browser default lang != syspref selected langs
      Bug 6755 Followup setlanguagecookie used in 2 places
      Bug 6869 Batch item modification fails whit accented characters
      Bug 6371 Item Types description not properly displayed if not pure ASCII
      Bug 6817 Downloading the overdues as a file ignores the filters if the page isn't in english
      Bug 6885 Allow superlib to delete items from any library
      Bug 6912 Test 008 presence in get CoinS function
      Bug 6825 OpacNav menu hide user menu on opac-user.pl page
      Bug 7038 Contextual help is always in English
      Bug 7026 Web installer does not switch language
      Bug 6883 Update userpermisions.sql fr-FR file
      3.6.0 Translations update

Fr?d?rick Capovilla (15):
      Bug 3580 Sort the facets categories so they don't move every search.
      Bug 6444 Corrects encoding problems in subscription-add.pl
      Bug 6363 : Make the "Item Location" selectbox appears correctly in inventory.pl
      Bug 6355: Correct GetLateOrders so it ignores cancelled orders
      Bug 5684 : Remove all items fields from a Z39.50 record imported for acquisition.
      Bug 6453 Corrects the barcode comparisons in inventory.pl
      Bug 5867 : Improved the email checking when sending "Hold filled" notices.
      Bug 5737: Modified the merge subroutine in AuthoritiesMarc.pm so it won't destroy the connection to the biblioserver.
      Bug 6235 : Corrects the behaviour of the humanmsg box on IE8 and IE7.
      Bug 6369 Correct a formatting problem in the pdf generation of basketgroup.pl
      Bug 6373 : Corrects a validation problem on addbiblio.pl on IE8
      Bug 6690: If multiple issues are received in serials-edit.pl, changing the status of any issue changes the date of the first issue.
      Bug 6479 Converts all the serialseq variables to UTF-8.
      Bug 6977 : Adds support for repeatable subfields when importing authorities.
      Bug 6854: Correct a double password encryption problem in import_borrowers.pl

Galen Charlton (4):
      history.txt updates for April 2011 releases
      bug 6409: fix pagination of SQL report output when parameters are used
      bug 5653: use itemcallnumber in bib label layouts
      bug 5780 followup: RIS export now includes all URLs

Greg Barniskis (1):
      Bug 6915 - [SIGNED-OFF] reduce module name truncation problem in koha_perl_deps.pl

Henri-Damien LAURENT (3):
      Fix for Bug 6669 - If a patron search returns one result, redirect to patron details page
      bug 6834 followup removing param_map
      Fix for Bug 5436 - Extended patron attributes display improvements

Ian Walls (53):
      Bug 3202: creating new 'child' categorytype patrons doesn't set branch properly
      Bug 6259: AllowHoldPolicyOverride causes every hold to need override
      Bug 6294: {BIBLIONUMBER} parsing for SearchForTitleIn
      Bug 5929: use branch admin email for advance_notice.pl emails
      Bug 6497: MARC URLs not showing up in OPAC detail page with XSLT off
      Bug 6512: time missing from item circulation history
      Bug 6512: time missing from item circulation history
      Bug 6497: MARC URLs not showing up in details pages under normal view
      Bug 6525: hold filled emails not going out
      Bug 6305: receiving serials does not create items
      Bug 6476: Baker & Taylor content not working
      Bug 5197: add <<today>> token to notices
      Bug 6476 Followup: more Baker and Taylor bookcover fixes
      Bug 6613: CSV basket export columns misaligned
      Bug 6614: Remove newlines from order notes when exporting to CSV
      Bug 6547: Add id attributes to messages in opac-reserve.tt
      Bug 6521 Follow up: previous patch breaks autoMemberNum functionality
      Bug 6476: Baker & Taylor Content Cafe link not showing
      Bug 2629: add char-with-stroke support to word-phrase-utf.chr
      Bugs 6634: manager_id not recorded for payments and rental charges
      Bug 6351: Cannot delete library-specific holds polices and checkout limits
      Bug 6256: Many bib1 attributes missing
      Enh 6165: Add OPACResultsSidebar system preference
      Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
      Bug 6863: Shelf Browser images not showing up
      Bug 6861: Fast Add returns to circ/circulation.pl in all cases
      Enh 6887: Add 'checked out from' column to issued items display tables
      Bug 6801: checkoverdues returns unnecessary fields, causing slowness
      Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
      Bug 6633: SCO return button doesn't work
      Bug 5236 Followup: items table information being keyed by biblionumber instead!
      Bug 6975: OPACBaseurl instead of OPACBaseURL
      Bug 6959: can't import record via Z39.50 from MARC edit page
      Enh 6403: Record local use stats when checking in unissued materials
      Enh 6403 DB changes: add RecordLocalUseOnReturn syspref
      Enh 6902: Novelist Select enhanced content
      Enh 6902: Novelist Select enhanced content
      Bug 5630 Followup: checkpw_ldap not imported
      Bug 6862: Duplicate VOKAL Book icons
      Bug 5995 Followup: checkpw was returning inconsistent values
      Bug 6789: biblios with many items can result in broken search results link
      Bug 6954: z39.50 results highlighting not sticking
      Bug 6949: cannot remove owner from fund
      Bug 6253 followup: explicitly check ref value for ARRAY before casting
      Bug 6553: parentheses in authors break tracings
      Bug 7016: CanBookBeReserved uses GetItemsInfo unnecessarily
      Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
      Bug 7059: Remove GetMemberDetails from reserve/request.pl
      Bug 7060: GetMemberDetails unnecessary in C4::Circulation
      Bug 7060 Followup: AddReturn needs GetMemberDetails
      Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
      Bug 7063: add available perl packages for Debian in install_misc/debian.packages
      Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list

JAMES Mason (1):
      Bug 6411 add another example to README.robots

Jane Wagner (1):
      Bug 6034 - Shelving cart feature can wipe permanent shelving location in certain circumstances

Janusz Kaczmarek (11):
      Bug 6365: Missing information about tab number when mandatory fields unfilled
      Bug 6463 - Authorities browsing error when using auth. plugins
      Bug 6462 - Authority type is not displayed in OPAC
      Bug 6357 : Displaying the unavailability of items corrected
      Bug 6353: Erroneous prefixes before the singleBranchMode preference removed
      Bug 6470 - Unable to filter out log entries for kohaadmin (user 0)
      Bug 6480 - Koha produces a lot of apache logs for UNIMARC
      Bug 6461 - BiblioDefaultView has no impact on how record are displayed when going from results list
      Bug 6468 - Authorities browsing error in OPAC
      Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
      Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)

Jared Camins-Esakov (9):
      Bug 6153: Display imprint subfields in order
      Bug 3543: split NLM call numbers in label creator
      Bug 6152: Document DOM authority index config
      Add unit tests to ensure bug 5683 doesn't reappear
      Bug 5683 follow-up: calls to ModBiblio can still fail
      Bug 5868 follow-up: missing subfields in subject index
      Bug 6103: MARC21 fields missing index for CCL
      Bug 5528: Analytic records support
      Bug 7007: 490 series statements should appear when not traced

Jean-Andr? Santoni (1):
      Bug 5639 (MT #3605) Fix escaping in ILSDI

Jeremy Crabtree (1):
      Bug 5094  auth_by_bind authentication can fail even if given a correct password and userid

Jesse Weaver (1):
      Bug 6492 - Deleted biblios cause rebuild_zebra to fail

John Seymour (1):
      Bug 4873 - Ensure that the required directories exist on init

Jonathan Druart (5):
      Bug 6061: clearing up system preference on update
      Bug 6076: acqui pdf error when marcxml wrong
      Bug 6048: printoverdues.sh bash odities
      Bug 6390: Implement 'see mine/my branches/all baskets'-syspref
      Bug 6390: Implement 'see mine/my branches/all baskets'-syspref

Joy Nelson (1):
      Bug 6773: circ/ysearch.pl is unlimited

Juan Romay Sieira (2):
      Bug 6144 - Cant hide constraints when showed at subfield edition
      Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage

Julian Maurice (2):
      Bug 5449: JSON malformed in Koha - Blocker with jQuery 1.4.x
      Bug 5098: Add csv headers in overdues

Katrin Fischer (44):
      Bug 6228: Show active currency in system preferences
      Bug 6263: shelf browser broken in 3.4
      Bug 6257: Fix broken MARC documentation links
      Bug 5445: Nicer breadcrumbs when ordering from different sources
      Bug 6265: Authority search in OPAC not exact
      Bug 6343: TT issues in label creator
      Bug 6340: Pagination bar on guided reports result page broken
      Bug 6415: Can't make patron card batch
      Bug 6472: HidePatronName on detail page broken
      Bug 5653: Follow-up, correction to nb-NO sample creator data
      Bug 6305: Subscriptions can not be edited
      Bug 6305: Copy enumchron into created serial item
      Bug 6589: Adding supplements broken
      Bug 6080: Add id to total line in funds table
      Bug 4497: Make tabs for managing suggestions translatable
      Bug 4433: Small display problem for topical subjects
      Bug 5418: Follow up fix for translated sys pref sql files
      Bug 6692: Small template change: Set > Set library
      Bug 6595:[ENH] [SIGNED-OFF] Add German translation of purchase suggestion mails
      Bug 6595: [ENH] [SIGNED-OFF] Fixing German translation and address formatting (HOLD_PRINT)
      Bug 6458: Incorrect translation processing - doc-head-close/open.inc
      Bug 6458: Incorrect translation processing / overdue.tt
      Bug 6458: Incorrect translation processing / review.tt
      Bug 6458: Incorrect translation processing / authorities.tt
      Bug 6458: Incorrect translation processing / 3x reports/...
      Bug 6458: Incorrect translation processing - masthead.inc
      Bug 6458: Incorrect translation processing / acqui/...
      Bug 6458: Incorrect translation processing / cataloguing/...
      Bug 6458: Incorrect translation processing / opac-detail.tt
      Bug 6458: Incorrect translation processing - rotating_collections/...
      Bug 6458: Incorrect translation processing / serials/...
      Bug 6458: Incorrect translation processing / sco-main.tt
      Bug 6458: Incorrect translation processing / suggestion
      Bug 6458: Incorrect translation processing / results
      Fix for Bug 6458 Follow-up for memberentrygen.tt
      Bug 3704: SIP Checkin of not checked out item returns error without reason
      Bug 3941 - Combine Notices & Messaging Tabs
      Bug 3941: Follow up
      Bug 6901: Add classes to XSLT detail view in STAFF
      Bug 6901: Add classes to XSLT detail view in OPAC
      Bug 6904: Changes 'asked' to 'pending' in suggestions for more consistency
      Bug 7022: Move sample_notices* sql files from optional to mandatory
      Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
      Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space

Larry Baerveldt (1):
      Bug 4841: biblio-level itemtypes not searchable in advance search by itype

Liz Rea (15):
      Bug 6258 - Guided reports wizard 'Build new' brings up empty page
      Bug 6380 - Z39.50 Cataloging Search needs a way to try search again, even if results are found
      Bug 6313 -- Adding option to "attach another item" when finished attaching items
      Bug 4951 - Print page doesn't close after print This patch adds the print/close functionality present on all other slips to the full page account summary.
      Bug 6478 -- add purge_suggestions.pl to the crontab.example
      Bug 6325 Bib detail - z39.50 button functionality should be under "Edit" menu
      Bug 6641 -- Specially crafted URL can allow unauthorized download of MARC files from staff client
      Bug 6643 -- Able to download patron card batches as an unauthorized user
      Bug 6527 - Table striping not working on cataloguing search
      Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
      Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address
      Bug 6871 - add schema and sql library reports to guided reports sidebar
      Bug 6927-- Typo in C4::Overdues.pm
      Bug 6942 - Add link to manual to help/admin/admin-home.tt
      Bug 6942 - Add link to manual to help/authorities/authorities-home.tt

MJ Ray (3):
      Added LSB information and copyright headers to two scripts in misc/bin. Thanks to Mahesh T Pai <paivakil at gmail.com> for the mailing list post Message-ID: <87y60x10de.fsf at gmail.com> containing them.
      Bug 5468: removin apt-get-debian-lenny and updating INSTALL.debian
      Bug 6460: alternative fix, updating template and script instead of C4::Log

Magnus Enger (18):
      Move nb-NO-i-staff-prog-v-3002000.po -> nb-NO-i-staff-t-prog-v-3002000.po
      Bug 6308 - Show number of comments - new patch
      Bug 6459 : Needless call to C4::Context->dbh in C4::Templates::themelanguage()
      Bug 6510 - [REVISED] Sort by in intranet search alters search and number of hits
      Bug 6450 - No check in/check out messages in message_queue
      Bug 6540 - Make ZEBRA_MARC_FORMAT and ZEBRA_LANGUAGE configurable for koha-create
      Bug 6540 - Followup patch adding command line options
      Bug 6540 - Add defaultsql command line option
      Bug 6540 - Add config file as command line option for koha-create
      Bug 6678 - Fix some problems with the standard NORMARC framework
      Bug 6540 - Followup - koha-create would die without --configfile
      Bug 6516 - Make borrowernumber of staff user configurable in koha-create
      Bug 4877 [ENH] - Update man page for koha-create
      Bug 6537 - squashed version of the previous 5 commits, signed-off
      Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
      Bug 4877 [ENH] Use DocBook for koha-common manual pages
      Bug 6953 - Value builder for NORMARC 007 does not show further options
      Bug 6982 - Don't show MARC tag documentation links for NORMARC

Marcel de Rooy (25):
      6429: Sync history/about
      6429: Sync history/about
      5860 Fixing stocknumber index
      6083: Adding some version numbers and newlines to improve output in web installer
      5662: Show control number without organization code in OPAC URLs
      Bug 4959 (Language inconsistencies on basket groups; skip confirmation when closing basket)
      4959: Language inconsistencies on basket groups; skip confirmation when closing basket.
      Bug 4839: Adjust default values for MARC21 authority Fixed-Length Data Elements
      Bug 4839: Follow-up patch for installing pref
      5660 Webinstaller should check if KohaOpacLanguage exists in staff
      6290: Fix warning on XSLT.pm
      5663: Show control number without organization code in staff URLs
      6747 Checks in opac-export
      6256 Follow up fixing typo
      6829: Remove two warnings for opac-MARCdetail
      6584: Enable searching on Zebra's Bib-level index
      6769 Getting rid of some RIS errors/warnings
      6786: False detection of index names in Search; make index names case insensitive
      6278 Funny translation bug with XSLT subfieldSelect parameters
      Bug 6996: Encoding problem in opac-showmarc
      Bug 5616: UTF-8 problem in Card View / Follow up
      6094 Fixing ModAuthority problems
      6094 Fixing ModAuthority problems
      6094 Follow up for cleanup_database
      7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter

Mason James (2):
      Bug 6991 - correcting committer info and adding company to koha-team page
      Bug 6992 - add missing tab chars to history.txt

Matthias Meusburger (2):
      Bug 6001 : batchRebuildBiblioTables.pl doesn't crash anymore when GetMarcBiblio fails. Unprocessed biblionumbers are displayed at the end of the execution instead.
      Bug 5995 : MT2892: Fix security issue in CAS intranet login

Maxime Pelletier (3):
      Bug 6794 : Fixing a bug with member flags in IE
      Bug 6679 : fix 3 perl::critic warnings
      Bug 6972: Hardcoded template paths to en in showmarc

Meenakshi.R (2):
      Bug id:6783 - Circulation restrictions dont work when other withdrawn reasons are used
      Bug:6781--Log membership renewal

Nicole C. Engard (70):
      Add missing library to release notes
      Follow Up for Bug 6143: New numSearchRSSResults preferences
      Bug 6330 - Change hold language from 'until' to 'since'
      Bug 6312: Remove references to login being OPAC only
      bug 6442 change opacnav wording so it's more accurate
      Bug 5268: Change all occurances of 'debar' to 'restrict'
      bug 6558 correct description for IntranetNav
      bug 6682: split openlibrary in to two words 'open library'
      bug 6701 - change timeout to say milliseconds
      Bug 6550 - update values for OpacRenewalBranch preference
      bug 6702 update typo in BiblioAddsAuthorities preference
      Bug 6706 : Add Crystal Clear Icon Set
      Bug 5252 - Phone labels on patron creation
      bug 6538 update letter.pl help file
      Bug 6662: Remove Dewey Specific References in Sort
      bug4966 - follow up to 4966 changes language from 'end' to 'finish'
      Follow up to Bug 6857: Change language from 'reserve' to 'hold'
      Bug 6716 - Document Borrowers Table
      Bug 6716 - MySQL definition for authorised values table
      Bug 6716 - MySQL Table Documentation - Biblio Table
      Bug 6716 - Deleted Borrowers MySQL
      Bug 6716 - Deleted Biblio Table
      Bug 6716 - Branch table documentation
      Bug 6716 Documenting two Branch Group tables
      Bug6716 - File Cleanup
      Bug 6716 - Borrower Attributes Tables
      Bug 6716 - Cities Table Documentation
      Bug 6716 - Issues Table Documentation
      Bug 6716 - Statistics Table Documentation
      Bug 6716 - Definition of the branchcategories table
      Bug 6716: DB Documentation for the branchrelations table
      Bug 6716: Documentation for the itemtypes table
      Bug 6716: Documentation for the letter table
      Bug 6716 - Document opac_news table
      Bug 6716 - Definition for the overduerules table
      Bug 6716 - Document reviews table
      Bug 6716 - Document roadtype table
      Bug 6716 - Document the systempreferences table
      Bug 6716 - Documentation for the fieldmapping table
      Bug 6716 - Documentation for the messages table
      Bug 6716 - Document z3950servers table
      Bug 6716 - Documents the virtual shelves tables
      Bug 6716 - Document subscriptionroutinglist table
      Bug 6716 - Document holiday tables
      Bug 6716 - Define reports_dictionary table
      Bug 6716: Document suggestions DB table
      bug 6677 - remove reference to 'debarred'
      Bug 6966: Admin Help Files
      Bug 6966 Acquisitions help files
      Bug 6966 Catalogue Help Files
      Bug 6966 Authorities Help Files
      Bug 6966 Cataloging Help Files
      Bug 6966: Circulation Help Files
      Bug 6966: Export help files
      bug 6966 update help files
      Bug 6966 update help files for labels
      Bug 6966: Members Help Files
      Bug 6966: Offline Circ Help
      Bug 6966 Patron Card Help Files
      Bug 6966 Reports Help
      Bug 6966 Holds Help
      Bug 6966 Comments Help
      Bug 6966 Update Serials Help
      Bug 6966 add missing routing lists help
      Bug 6966 Suggestion Help Files
      Bug 6966 Tag help file
      Bug 6966 Update tools help files
      Bug 6966 Lists help file
      Bug 7044 OPAC Branch Selector Fix
      Follow up for Bug 6390: Add upatedatabase.pl

Nu?o L?pez Ans?tegui (1):
      Bug 6277 : CustomLog by default

Owen Leonard (119):
      Fix for Bug 2941 Transfers cannot be canceled once initiated
      Fix for Bug 6295 - misaligned columns in opac suggestions list
      Fix for Bug 6284, Reports Filters Need Prettying
      Fix for bug 6367 - 'Preview MARC' hover button does not show correct MARC record
      Fix for Bug 6395, Cannot create routing list
      Fix for Bug 3140 - It is possible to email someone else's private list
      Fix for Bug 6370 - news showing that it's for the opac when it's for the librarian interface
      Fix for Bug 6378 - Misaligned columns on tags approval page
      Fix for Bug 5020 - on patron record sex should be gender
      Fix for Bug 6332, Hold forms missing 'clear date' link
      Fix for Bug 6417 - Template variable errors in Guided Reports
      Follow-up fix for Bug 6170 'More options' in advanced search broken
      Fix for Bug 6300 - can't get to other pages of marc import
      Fix for Bug 6364 - Display of item availability broken on OPAC detail screen
      Fix for Bug 6408 - column alignment off on the patron categories admin
      Fix for Bug 6306 - It is not possible edit news
      Fix for Bug 6338 - Datepickers on OPAC hold form does not work
      Fix for Bug 5714 - Unescaped ampersands in OPAC facets
      Fix for Bug 6337 - Variable scope errors in staff client cart print view
      Fix for Bug 6446, batch item deletion interface problems
      Fix for Bug 6487 - No error explanation if patron expiration date is missing
      Fix for Bug 6402, Lists sorted by year appear to be empty
      Fix for Bug 6377 - fines should be red on patron search
      Fix for Bug 6375, Markup and style corrections for overdue report
      Fix for Bug 6501 - missing scroll bar when updating child
      Alternate fix for Bug 6522 - search result list broken
      Fix for Bug 6543 - Column hiding on batch item edit/delete not working
      Fix for Bug 3397 - Deleting item record leaves a hole in patron's reading history
      Fix for Bug 6531 - clicking print button in opac causes 404 error
      Revised fix for Bug 6133 - Authorised values administration, warn for modifs
      Fix for Bug 6573 - Library name entry field enforces unnecessary maxlength
      Fix for Bug 6577 - columns misaligned on serials search results
      Fix for 6426 - messaging not showing on patron categories
      Fix for Bug 6570 - unlabeled box on funds form
      Fix for Bug 6586 - calendar showing the wrong event type when editing
      Fix for Bug 6587 - Tag moderation lost colors
      Alternate fix for Bug 5876, New permission for overdues report
      Fix for Bug 6578, serial items have misaligned columns in holdings table
      Fix for Bug 6596 - Acq framework has white space for hidden fields
      Fix for Bug 6599 - Don't show dictionary definition table if there are no definitions
      Fix for Bug 6601 - dictionary items not adding to query
      Fix for Bug 6608 - Date-pickers broken on guided reports pages
      Fix for Bug 6484 - due date sorter on 'my summary' missing
      Fix for Bug 6612 - Sort pulldown for messages in alphabetical order
      Follow-up fixes for Bug 5917, Switch Koha to use Template::Toolkit
      Fix for Bug 6622 - Remove closing style tag from staff-global.css
      [SIGNED-OFF} Fix for Bug 6623 - Nicer style for "clear screen" button
      Fix for Bug 6638, Columns misaligned on serials claims
      Additional change for bug 5922 - Show waiting items for patron on return
      Fix for Bug 6635, Can't page through results in label batch
      Fix for Bug 5433 - Separate state field for cities
      Fix for Bug 6534 - Duplicate opac renew buttons at the top of the checkouts list
      Fix for Bug 6260 - Missing space in availability information of OPAC XSLT results
      Fix for Bug 6291, Cart printing truncated in Firefox
      Fix for Bug 6686, Can't delete messages
      Fix for Bug 6346 - Patron search results should be valigned top
      Fix for Bug 6309, subscription table sorter in the opac
      Fix for Bug 6743 - displayFacetCount not working
      Fix for Bug 6640, Locations not showing in circ reports
      Fix for Bug 6754, Improve breadcrumbs on lists pages
      Fix for Bug 6753, Markup corrections and improvements for label export window
      Fix for Bug 6728, Table sorter for receiving acquisitions
      Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
      Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
      Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
      Follow-up to Bug 4868, Improve controls for cloning and deleting subfields
      Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
      Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
      Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
      Fix for Bug 4893, Add an input field for Check In on main Staff Client page
      Fix for Bug 4419 - cannot change module for notice templates
      Fix for Bug 6791 - editing list with apostrophe loses text
      Fix for Bug 6652, Zip showing in funny place on libraries admin
      Fix for Bug 6696, New category button broken when no categories defined
      Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
      Fix for Bug 2539 - kohaspsuggest is deprecated, notes outmoded
      Fix for Bug 6768, Two unused include files can be removed
      Fix for Bug 5028 - Remove references to catmaintain.pl
      Fix for Bug 6609, Clean up guided reports dictionary entry process
      Fix for Bug 5234 - Remove unused CSS files
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
      Fix for Bug 6458 - incorrect parsing result in translation processing / branches
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Follow-up fix for Bug 6458, incorrect parsing result in translation processing
      Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6458 - incorrect parsing result in translation processing
      Fix for Bug 6766 - Template variable scope errors in holds template
      Fix for Bug 6842 - Branch transfer limits broken
      Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling
      Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
      Fix for Bug 4298 - Title detail display: improve display of item level hold information
      Fix for Bug 6872 - Can't set default SMS messaging options for patron category
      Fix for Bug 6600, Library name linking wrong if current location is different
      Fix for Bug 4223 - Too much serials info - design work needed
      Fix for Bug 6616 - Move common table pager markup to include
      Fix for Bug 6689 - Improve styling of table pager
      Fix for Bug 5898 - search to hold feature not clearing
      Fix for Bug 6970 - logout not redirecting to login page
      Fix for Bug 7019 - Circulation History Sort Order Wrong
      Fix for Bug 7024 - Can't delete other library's messages with AllowAllMessageDeletion on
      Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
      Fix for Bug 7043 - masthead_search id used twice in template
      Fix for Bug 6957, authors disappearing when emailing lists
      Fix for Bug 6980, Patron attributes are shown when ExtendedPatronAttributes is disabled
      Follow-up fix for Bug 4473 - Recent comments view for the OPAC

Paul Poulain (19):
      BZ6066 let's the librarian choose the itemtype when ordering
      BZ5719: unimarc plugin fixes
      BZ6412 : spaces in note
      Bug 5433 follow up - kohastructure.sql missing
      BZ6073: string misses to be translatable
      bug_4002: issues referential integrity
      Bug 6121: follow-up = using overloo instead of reserveloo
      Bug 6537 [SIGNED-OFF] follow-up = removing non specific lines for french unimarc
      BZ6074: setting import flag when staged file imported in aqbasket
      Bug 6268: (MT #6408) Bad Total in basket.pl
      BZ6268 follow-up for the form
      Bug 5630, follow-up
      Bug 6840 warning in logs
      Bug 7034: de-nesting C4/Branch.pm
      Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine
      Bug 7036 de-nesting C4::Circulation
      Bug 7037 de-nesting C4/Print.pm
      Bug 7051 de-nesting C4::Reserve, 1st step
      Bug 6285 strange order in CSV upload

Ricardo Dias Marques (2):
      Updating INSTALL.opensuse file with the changes by Freek de Kruijf
      Bug 6503 - Variable $sth is declared 3 times (with keyword "my") in "makepayment" sub of "Accounts.pm"

Robin Sheat (26):
      Bug 5509 - use an XML parser to get values from config
      Bug 6361 - make the packages work with koha 3.4
      Bug 6521 - allow blank cardnumbers to not trigger "already in use"
      Bug 6526 - make the reserves code use the borrowernumber
      Bug 6540 - [SIGNED-OFF] fix some command-line args issues
      Bug 5602: Changes to account for the version update.
      Bug 5072 - prevent creating new orders if there are no valid budgets
      Bug 6275 - allow automated backups for packages
      Bug 6626 - add sudo as a package dependency
      Bug 6482 - allow the mysql details to be changed during koha-create
      Bug 6486 - add the koha-mysql command
      Bug 6486 - make koha-mysql get installed with the packages
      Bug 6722: [SIGNED-OFF] Cause build output to appear on the screen
      Bug 4877 [ENH] - [SIGNED-OFF] more man page improvements
      Bug 6687 - allow people to be moved in the holds queue
      Bug 6857: display a charge warning alert for reserves
      Bug 6651 - fix splitting of names when updating to 3.4
      Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
      Bug 6360 - add some more sounds to some happenings on returns
      Bug 6824 - correctly check basket viewing permissions
      Bug 4877 - note that the create-db (or related) options are required
      Bug 6205 - if an include doesn't exist, fall back to en
      Bug 6937 - change "Fines" to "Fees & Charges" on circ page
      Bug 6636 - add 'powered by Koha' text to OPAC footer
      Bug 6938 - replace two subscription fields that were incorrectly removed
      Bug 6929 - ensure that koha-stop-zebra will try to stop everything

Salvador Zaragoza Rubio (2):
      Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
      Bug 6483 - Paging in opac-detail when coming from a search

Sophie Meynieux (3):
      Bug 6474 Barcode not incrementing properly in format HBYYMMINCR if HB contains -
      Bug 6078: Request to find borrowers without issues overload the server
      Bug #6139 Automatic incrementation of call number does not work if prefix contains '

Srdjan Jankovic (13):
      Bug 6033 : wr77488 : report selection filter
      bug_4415: Copy parent contact details to child when adding Let child details be managed separately
      bug 5602: Rewriting the package making script Now it is a perl script. Various pdebuild flexibility.
      bug_6410: correct borrowernumber template var name
      Bug 6721 - improve searching in the acquisitions system
      bug_6318: Always give predefined fields drop downs on label layout edit
      bug_6576: Submit when changing framework rather then reloading
      bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
      bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
      bug_6974: bugfix: do not create empty record before building input for new biblio
      Bug 6405: added enumchron to reserve copy list
      bug_5533: Slightly improved marking items as lost
      bug_6253: Unified member Search()

Srdjan Jankovi? (1):
      bug_6433: exception handling

Steven Callender (1):
      Bug 6822: fix RIS export from OPAC

St?phane Delaune (2):
      Bug #6143 - New feature: capability to limit the RSS results
      Bug 6135: insert fields ordered in C4::biblio:ModBiblioMarc

Thatcher Rea (1):
      Bug 6871 - Have a link to the schema page on the reports page

Tomas Cohen Arazi (29):
      Bug 6320 - Provide language filter selection in adv an id inside a div
      Add entries so Z39.50 public server works
      Bug 6316 - Initial commit for es-ES translated scripts
      Bug 6316 - MARC21 files
      Bug 6316 - UNIMARC files
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - MARC21 files (split part)
      Bug 6316 - es-ES inclusion - Last fixes
      Bug 6683 - (es-ES) translate SQL scripts description
      Bug 6744 - Acknowledge the actual es-ES translators

Ulrich Kleiber (1):
      Bug 6765: sip2 unicode checksum

Ward van Wanrooij (1):
      Bug 6723 : import-framework-crlf

Zeno Tajoli (1):
      Bug 5462: Update of the italian sql files The bug is about strings that are used as variables by Template::Toolkit The strings need to be like valid perl variable names. To fix the bug we need to fix also .sql files. Others .sql files are OK. Italian .sql file needs this fix

conan (aka Fernando Canizo) (1):
      Bug 6218: patron gets dot added if no first name

conan (aka Fernando L. Canizo) (1):
      Bug 3674: reimplementation

preprod34 (2):
      Bug 6714 : Removed the "en" in some paths of opac.css
      Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.

ruth at bywatersolutions.com (5):
      Bug 6401 fix to the history file
      Bug 5579: further fancifying remove_items_from_biblioitems.pl
      Bug 6362: fixes display to re-embed items in OPAC MARC view
      Bug 6397: fix variable name in template that mis-aligns table
      Bug 6467: Add shelving location to checkin screen

-----------------------------------------------------------------------


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 26 01:50:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 25 Oct 2011 23:50:37 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-118-g61ea6ad
Message-ID: <E1RIqlQ-0001pQ-O0@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  61ea6ad38827262c378729a25beac83d9ad2cf49 (commit)
       via  cb787cf84247dc0a8249944b1e154600749cb540 (commit)
       via  ea602708b602e70380621e2fbcddbb9eb1ebd329 (commit)
       via  a2c7779b91e14015e44bcc1d1d2758a3b4d3aab7 (commit)
       via  608c23e6bd9a43155ac1b2b1158d7476a88ee882 (commit)
       via  fecb2920c7a2bc2234cb3ae3d200ed19a804741e (commit)
       via  fa08d3b72840c3d016f1bb5e1aefd4cc64989994 (commit)
       via  422a82e0957bdd73af5e4816a6eb7cb54232ce14 (commit)
       via  35987009bc95aa89a8947544abbecbe517348db0 (commit)
       via  a95b6cb963f866c6f2bb0977a9d7fb7532a88624 (commit)
       via  cca7dd8dc42c3d0749bc25bca0b9cda03cba3952 (commit)
       via  ddf212bd2928b8e9528093537193bad7691844a3 (commit)
       via  bc398d5b97e3c426433f716670f44423a0a87199 (commit)
       via  f5660195a5f0f74a8277fb44cee57ce4e55836b5 (commit)
       via  258d980197403a6501409a69d8f54fd34481d60a (commit)
       via  ecb4cd1782384c98d9bbb931ed3b25ed5133940e (commit)
       via  ecf41dd5adcf40b664414b2e2045efa387213e22 (commit)
       via  72871afb5305358b3842beb621c9c9c535ee6a7a (commit)
       via  96a2765047e5b6732d45c89ce0645022bb5ce457 (commit)
       via  7768b9b41d3e7a1eba574bb4d14d4d75bc9f6b66 (commit)
       via  56ea10433c236cab65ce09d005cd3b0eecef0874 (commit)
       via  1d6553710f7865dc14e5ca0a1f2a631570cedcf3 (commit)
       via  838df87bec05d2751caff49958e8e418a5fb1e90 (commit)
       via  a82959ed04aa15bb8bf1c56ed0f384885ba39f90 (commit)
       via  1c0334d0fa24caeddfa1342d6c0d7f770ac3880f (commit)
       via  d4b1669a15f29cfdf28626ec29acf19dc2413f47 (commit)
       via  191fb637874d22204bab55ba95c0f94d04dcbeb9 (commit)
       via  33b4c9859fd4d8853f59f3de704a34da11b087a1 (commit)
       via  2c627d6150b4f56fb7405abeb36bbaf68d623ea4 (commit)
       via  0342705cf42f666125d1c9c9cb18a6650819ecb2 (commit)
       via  cfdcc7abc14255d8e273dda0056d50c90af5c05d (commit)
       via  54ce3fde2b73ce110a175a3bcabec52742b3b2d3 (commit)
       via  f105fddc196ec64726d6256974fe1a2b5001e3d1 (commit)
       via  c8455a012e07a61051eeb3a9c42301f881d2505b (commit)
       via  0bfcc803adaadcb560eada0374a9d7cb2180a7a6 (commit)
       via  7ee4dc6e8ca427728844e422c013ac4dcccec9f8 (commit)
      from  52bcc2560a71f38f8e4ef840a180603612c14f50 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 61ea6ad38827262c378729a25beac83d9ad2cf49
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 14:41:03 2011 -0400

    Bug 7078: Remove HTML::Template::Pro from Koha perl dependencies list
    
    Removes HTML::Template::Pro as a requirement (since we're now on Template::Toolkit).
    
    To test:
    
    On a system without, HTML::Template::Pro installed, run perl koha_perl_deps.pl -m -u
    
    Shouldn't return anything about HTML::Template::Pro
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d52095b48c9ef2a7249d367554da07277dd7bd09)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cb787cf84247dc0a8249944b1e154600749cb540
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 14:16:51 2011 -0400

    Bug 7063: add available perl packages for Debian in install_misc/debian.packages
    
    Takes work done by Eduardo Tr?pani, alphabetizes, and adds two other packages:
    
    libuniversal-require-perl
    libgravatar-url-perl
    
    From my testing, only CGI::Session::Driver::memcached remains missing; it is only
    packaged for sid and wheezy at this time
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0953e8ca09d8f6010991523c2713e4546b12d907)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ea602708b602e70380621e2fbcddbb9eb1ebd329
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 10:18:14 2011 -0400

    Bug 5995 Follow up: variable scope in koha/sco/sco-main.pl
    
    The patronid value (cardnumber) set by checkpw in the case of SelfCheckoutByLogin
    was improperly scoped with 'my' inside a conditional.  The changes followup to 5995
    made this more apparent, causing logins to fail.
    
    Also added "parts copyright" statement to the script, since ByWater Solutions did make some
    significant contributions to the operations of the page
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a2c7779b91e14015e44bcc1d1d2758a3b4d3aab7
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 10:49:58 2011 -0400

    Bug 7060 Followup: AddReturn needs GetMemberDetails
    
    In my haste, I overlooked circ/returns.pl's need for borrower flags.  This patch
    changes back the call in AddReturn from GetMember to GetMemberDetails
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c5bc35b6945a03e27dd369d368be33d97f76e509)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 608c23e6bd9a43155ac1b2b1158d7476a88ee882
Author: Fr?d?rick Capovilla <frederick.capovilla at sys-tech.net>
Date:   Wed Sep 7 14:15:35 2011 -0400

    Bug 6854: Correct a double password encryption problem in import_borrowers.pl
    
    When the CSV file has no password column and no default value was set for
    the password :
    If we try to modify an existing user, the password from the BD is sent
    to ModMember, which then encrypts the already-encrypted password a
    second time.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6854
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Confirmed bug on current master.
    1) Import new patron with password provided
    > OPAC login works
    2) Overwrite patron record, password provided
    > OPAC login works
    3) Overwrite patron record, password not provided
    Before patch: OPAC login broken, password in database changed
    After patch: OPC login works with same password as before
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 906ef4b28c376254743f948808e8ae47bb6f0a01)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fecb2920c7a2bc2234cb3ae3d200ed19a804741e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Oct 17 11:32:50 2011 +0200

    7042 Improving cleanup_database.pl: handling quotes in a_session and interpreting sessdays parameter
    
    Improving the cleanup_database.pl script in two aspects:
    1) In some cases CGI::Session seems to place quotes around the atime and ctime
    data in the a_session field. Two regexps now take this into account.
    2) If the --sessdays parameter is used, the --sessions parameter is now
    implicitly enabled too.
    
    With thanks to Ian Bays and Tom Hanstra.
    
    Signed-off-by: Ian Bays <ian.bays at ptfs-europe.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a7ee2993f02fb45f704c92ffdc49f840e05f5bd0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fa08d3b72840c3d016f1bb5e1aefd4cc64989994
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 20 09:57:12 2011 +0200

    6094 Follow up for cleanup_database
    
    Adds purging completed entries from need_merge_authorities table.
    If you set dontmerge to ON, you need to periodically remove records.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c56d12c721684bfd3bac0e9bd9cf17f8f29651a9)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 422a82e0957bdd73af5e4816a6eb7cb54232ce14
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 19:55:22 2011 -0400

    Bug 7060: GetMemberDetails unnecessary in C4::Circulation
    
    Replaces all instances of GetMemberDetails with the more efficient GetMember.  Since
    no hash values other than the borrowers table's fields are used in this module, the
    transition is safe.
    
    To test:
    
    1.  Checkout a material; the page should load without error
    2.  Renew a material: the page should load without error
    3.  Return a material: the page should load without error
    
    The above test plan invokes all the subroutines affected by this patch; any call to an undefined
    value in a hashref should give a warning
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 769acee41ae258ea4efb0114eb7995736496a9cf)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 35987009bc95aa89a8947544abbecbe517348db0
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 17:56:18 2011 -0400

    Bug 7057: CheckReserves uses GetMemberDetails unnecessarily
    
    Replaces call to GetMemberDetails with a call to GetMember.  Much more efficient,
    and since only branchcode is used, no required data is lost.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a1e3975067bf484f8d5f621e042e41baeb69d7b7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a95b6cb963f866c6f2bb0977a9d7fb7532a88624
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 17 22:04:53 2011 +0200

    Bug 7049: [SIGNED-OFF] Item form on order receive has lots of blank space
    
    The item form on the order receive page (AcqCreateItem = on receive) contains a
    lot of blank space which makes it hard to read and fill out.
    
    To test:
    - set AcqCreateItem = on receive
    - create basket, order something, receive shipment
    - check item form is nicely formatted and doesn't include lots of blank space
    
    Note: It will be easier to test if you have an ACQ framework created to hide some
    unnecessary subfields, because the hidden fields create the blank space.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Created an ACQ framework and hid some of the fields (hidden = 5). Before the
    patch there were gaps between the fields as shown in the screenshot from
    Katrin. After the patch fields line up nicely, with no extra space between
    them.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 224140a2b60aa7bbf4aeb352e1c31f80974a05db)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cca7dd8dc42c3d0749bc25bca0b9cda03cba3952
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Oct 13 23:47:16 2011 +0200

    Bug 7027: [SIGNED-OFF] Corrections to German web installer txt files
    
    Rephrasing, correcting typos, removing blank lines
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Does not break the web-installer and I'm assuming
    Katrin is doing the right thing when it comes to
    the German text, so signing off!
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a46cbc03ee60b8894e5f37f830d2deea4629aa05)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ddf212bd2928b8e9528093537193bad7691844a3
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Tue Oct 25 19:38:33 2011 -0400

    Updating Version Number to 3.04.05.002

commit bc398d5b97e3c426433f716670f44423a0a87199
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 25 11:33:23 2011 +0200

    6094 Fixing ModAuthority problems
    
    Only contains db revision to insert new table need_merge_authorities.
    You can apply the revision by running
    cgi-bin/koha/installer/install.pl?step=3&op=updatestructure. (Will not change
    your version while testing.)
    
    Oct 19, 2011: Rebased after functionality patch signoff.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f5660195a5f0f74a8277fb44cee57ce4e55836b5
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Apr 7 10:14:08 2011 +0200

    6094 Fixing ModAuthority problems
    
    Pref MergeAuthoritiesOnUpdate does not exist; should be dontmerge
    (AuthoritiesMarc.pm).
    
    Instead of folder modified_authorities, now introducing a table for this
    purpose: need_merge_authorities. This eliminates several permissions and
    security issues. This change applies to AuthoritiesMarc.pm and
    merge_authority.pl.
    
    POD lines added for ModAuthority. Deprecated parameter $merge removed.
    
    Test this patch by applying the db revision first from the second patch.
    
    August 4, 2011: Rebased.
    
    Signed-off-by: Fr?d?ric Demians <f.demians at tamil.fr>
    
    Thanks Marcel. It works as advertised. Both modes are functionnal
    (back):
    
    - Immediate with dontmerge=0: After modifying an authority record, its
      linked biblios are immediately modified. This isn't the case in 3.4.5.
    - Delayed with dontmerge=1: After modifying an authority record, its
      linked biblios are not modified. But an entry is added to
      need_merge_authority new table and 'merge_authorities.pl -b' script
      updates biblios.
    
    Comment: need_merge_authority, like zebraqueue, should be cleared
    from time to time.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 05d35b0ae0af257b51fbd14a9ec010c957157a8f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 258d980197403a6501409a69d8f54fd34481d60a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Oct 3 11:22:30 2011 -0400

    Bug 6553: parentheses in authors break tracings
    
    If an author's name includes parentheses or other escape-characters, the tracing links
    produced in the OPAC and staff client fail in XSLT mode.  This patch wraps the author names
    in double-quotes, providing the necessary escapement.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan:
    - Create a new framework, delete Thesaurus from 700 and other fields
    - Create a new record in this framework
    - Add 700$a - use parentheses
    - Check the search links in OPAC and staff detail pages
    > before patch link was broken, after it works
    
    Note: Links are only broken when no authorities are being used.
    When using authorities the link uses the auth number instead of the text
    for linking, so the parentheses don't matter for search.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0ae2c3c4ceab85993ee23360d2c0d5409f465df6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ecb4cd1782384c98d9bbb931ed3b25ed5133940e
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Wed Oct 19 11:46:21 2011 -0400

    Bug 6253 followup: explicitly check ref value for ARRAY before casting
    
    in C4::SQLHelper::_Process_Operands, $operand has been modified to be cast as an array ref
    if the incoming $operand is not a ref.  However, the incoming $operand could be some other
    kind of ref (hashref for example), which would case the dereferencing in line 419 to fail and exit.
    
    Adding an explicit test for whether the ref is ARRAY seems to clear up this issue.
    
    To test, run t/db_dependent/Members.t.  Before, it fails after test 3.  After, it completes all tests.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d80cf35e9ba39112bfdefc3ce6ba8ddae121347c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ecf41dd5adcf40b664414b2e2045efa387213e22
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Oct 20 01:52:52 2011 +1300

    Bug 6972 : Followup fixing bad indentation
    (cherry picked from commit d50de1f040be4b6498cc054689f524fd7d13321f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 72871afb5305358b3842beb621c9c9c535ee6a7a
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Tue Oct 4 14:32:08 2011 -0400

    Bug 6972: Hardcoded template paths to en in showmarc
    
    Couldn't help but reformat the indentation a bit.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Card view works correctly in cataloguing search.
    Plain view/labelled show correctly in OPAC.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Fixing merge conflict.
    (cherry picked from commit 030fe0570f6ae2d0561756ee2168c1d3528af985)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 96a2765047e5b6732d45c89ce0645022bb5ce457
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Fri Oct 7 13:38:15 2011 +0200

    Bug 6982 - Don't show MARC tag documentation links for NORMARC
    
    Links to UNIMARC documentation were being shown when marcflavour =
    NORMARC. This patch hides the doc link functionality for NORMARC
    by hiding:
    1. The checkbox for turning doc links on/off
    2. The hyperlinked questionmarks
    
    This patch does not hide e.g. the JavaScript functions related to
    the doc link functionality, in order to make it easy to add
    doc links for NORMARC in the future (hopefully).
    
    The doc link functionality was passing a variable called MARC21
    (based on the contents of the marcflavour syspref) to the
    template and testing the value of this to decide if MARC21 or
    UNIMARC doc links were to be shown. I have replaced this variable
    with he standard/full marcflavour syspref, in order to make it
    possible to test for more then two MARC dialects.
    
    To test:
    - Set the marcflavour syspref to MARC21, NORMARC and UNIMARC, one
      after the other.
    - Check that correct doc links are shown for MARC21 and UNIMARC
      on the cataloguing screen, and that no checkbox and no doc links
      are displayed for NORMARC.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described - thx for the great test plan!
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c7a2ef33177f176b8c5a5c12da9586de77569af1)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7768b9b41d3e7a1eba574bb4d14d4d75bc9f6b66
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Apr 29 19:31:40 2011 +0200

    Bug 6285 strange order in CSV upload
    
    uploading the circ overdues result in a csv with columns in a strange order
    and not the order of the screen
    This patch reorder the column by putting the usefull ones first
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f6043fbbe49eba279ee0635c43dd5a46a20eeb52)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 56ea10433c236cab65ce09d005cd3b0eecef0874
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Oct 10 13:04:34 2011 +0200

    Bug 5616: UTF-8 problem in Card View / Follow up
    
    Decode data only if needed.
    Add instruction to use UTF8 in html header.
    Force utf8 on output handle.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Umlauts and other diacritics in card view of z39.50 search are now
    correctly displayed.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
      removed 2 commented lines
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 980d8fbed45b3d43341347e612b777b54fd12d10)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 1d6553710f7865dc14e5ca0a1f2a631570cedcf3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Oct 12 14:43:53 2011 +0200

    Bug 6996: Encoding problem in opac-showmarc
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    No more encoding problems spotted.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a7d0255f19bf2de5a9bfc50eb76e108ed32e85c0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 838df87bec05d2751caff49958e8e418a5fb1e90
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Sep 28 19:09:01 2011 +1300

    Bug 6929 - ensure that koha-stop-zebra will try to stop everything
    
    Currently, if it attempts to stop a zebra process that doesn't exist,
    the script will abort, which leaves things running. This patch prevents
    it from aborting.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit aca414977ac3f16cec353c23c59a298ee828d24c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a82959ed04aa15bb8bf1c56ed0f384885ba39f90
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Sep 22 09:43:12 2011 -0500

    bug_6253: Unified member Search()
    
    Removed SearchMembers() and replaced with more generic Search()
    Amended Search() to try cardnumber first
    Replaced SearchMembers() calls with Search()
    Replaced SELECT with Search() where appropriate
    C4::SQLHelper:
    - added support for '' key for search filter.
    - when passing an array to filter, join with OR (rather than AND)
    - added support for key => [val1, val2] in filter
    - did not document - there was no input documentation to start with,
      and SQLHelper should be replaced with something better anyway
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    (again - testing merge issue)
    The functionality of the patch seems to be maintained with Biblibre's changes.
    
    I tested the following:
    Extended attribute searching: works
    3 part name searching: works
    2 part name searching: works
    1 part name searching: works
    
    From:
    mainpage.pl
    members-home.pl
    	Patron search limited by branch: Works
    	Patron search limited by patron category: works
    	Ordering by cardnumber instead of surname: works
    The "Check Out" field in the masthead.
    
    Circ Autocomplete is not reliably functional at this time, but the problem appears to predate this patch.
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 18b8991cf1832a0ee79a526e6438b51fdb4f3208)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 1c0334d0fa24caeddfa1342d6c0d7f770ac3880f
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Jun 23 21:09:30 2011 +1200

    Bug 6526 - make the reserves code use the borrowernumber
    
    Previously it used the cardnumber, which caused numerous issues if your
    users don't have card numbers.
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 218a35776e0e212567c15db4a486969debd67859)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d4b1669a15f29cfdf28626ec29acf19dc2413f47
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Tue Oct 11 15:21:04 2011 -0400

    Bug 7007: 490 series statements should appear when not traced
    
    Although the MARC21 standard requires libraries to set the first indicator to
    '0' when a 490 field is untraced, many libraries leave it blank. Previously,
    this resulted in a blank line with the label "Series:" but no actual series
    information. This patch fixes that by showing untraced series headings for
    490s whenever the first indicator is not set to '1'
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Checked that series shows correctly when first indicator is 0, 1 or not set.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit fb3272febd08e2e570931f1a0eba4c3dbacc89b2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 191fb637874d22204bab55ba95c0f94d04dcbeb9
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Oct 17 08:03:29 2011 +0200

    Bug 7026 Web installer does not switch language
    
    Language installer should switch to template files of language selected in
    first step. It used to do that, but the feature seems to be broken now. Web
    installer remains English after selecting a different language.
    
    To reproduce:
    
    - make sure your database is empty
    - run 'perl translate install <some language>
    - access web installer
    - select language other then en on the first page
    
    => templates should change to translated templates
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Test plan provided works, correct language and sample files are selected.
    
    In a second test I deleted the staff templates for de-DE and repeated
    the steps. de-DE is not offered in the language selection of the web installer
    now, but does appear in the opaclanguages list after running the web installer.
    (Bug 5660)
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1bf7550a82e7fc8b1c608fde3ff236af65b83dfc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 33b4c9859fd4d8853f59f3de704a34da11b087a1
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:32:54 2011 +0200

    Bug 7051 de-nesting C4::Reserve, 1st step
    
    C4::Search is not used, so removing it from C4::Reserves
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 7631bae2b2e5f6f2f71ddc4fe841816cd4688047)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2c627d6150b4f56fb7405abeb36bbaf68d623ea4
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:31:10 2011 +0200

    Bug 7037 de-nesting C4/Print.pm
    
    removing use C4::Circulation, that is useless
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 86e9c29f54e16a276889b10c1245ad1588147e35)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0342705cf42f666125d1c9c9cb18a6650819ecb2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:30:44 2011 +0200

    Bug 7036 de-nesting C4::Circulation
    
    Just removing use C4::Koha, as other packages are widely used.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 56b9412562599d1decabb27e7d4f562ec63c005a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cfdcc7abc14255d8e273dda0056d50c90af5c05d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 16 19:29:47 2011 +0200

    Bug 7035 de-nesting C4::ClassSource & ClassSortRoutine
    
    just removing use C4::Koha, that are useless
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 94b067b53c566c320478eb074e4250ed9c86b51d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 54ce3fde2b73ce110a175a3bcabec52742b3b2d3
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 16 18:09:57 2011 +0200

    Bug 7034: de-nesting C4/Branch.pm
    
    use C4::Koha was loaded only to call C4::Koha::get_infos_of in get_branchinfos_of
    
    the sub get_branchinfos_of was used nowhere
    (checked with "grep -R get_branchinfos_of *")
    only one reference was made to get_branchinfos_of, in reserve/request.pl, but the sub was not used in fact (maybe removed previously & silently)
    
    This patch removes sub get_branchinfos_of and use C4::Koha in C4::Branch, as well as the reference in request.pl and the t test
    
    The patch doesn't remove use C4::Branch in reserve/request.pl, as it's still used for other subroutines.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 69732f5c62337a97269d8b0b09343805a970c6fa)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f105fddc196ec64726d6256974fe1a2b5001e3d1
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Oct 13 10:11:46 2011 -0400

    Bug 6949: cannot remove owner from fund
    
    The Javascript to remove an owner from a budget cleared the name from the screen, but did not remove
    the actual value in the form, so when saving, the original owner was retained.
    
    This patch adds the command to set the value to ''.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I could reproduce the bug on current master. Patch fixes the problem, fund
    owners can now be added and removed without any problems.
    Thx for providing a test plan!
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 9c84f38b3496f32037a97b441aab21e8c2647250)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c8455a012e07a61051eeb3a9c42301f881d2505b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 19 02:57:18 2011 +1300

    Updating perl version required to match reality
    (cherry picked from commit 5faaa7f13a17d29197b1bced3bd86731d61ee0d7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0bfcc803adaadcb560eada0374a9d7cb2180a7a6
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 17 11:51:16 2011 -0400

    Fix for Bug 7043 - masthead_search id used twice in template
    
    Changing ID of library selector, and moving inline styles to
    the CSS as requested by kf in the bug comments.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 72f826963c20dfdc6c5934693089e3d3e83ec1ec)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7ee4dc6e8ca427728844e422c013ac4dcccec9f8
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 6 15:13:30 2011 -0400

    Fix for Bug 6983 - Item type filter on overdues report does not respect item-level_itypes
    
    This patch adds a check for the item-level_itypes preference
    when building the SQL for the overdues report.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 15e846d74aa30d3bfa5222d009171313594590d7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/AuthoritiesMarc.pm                              |   35 ++--
 C4/Branch.pm                                       |   29 ---
 C4/Circulation.pm                                  |   13 +-
 C4/ClassSortRoutine.pm                             |    1 -
 C4/ClassSource.pm                                  |    1 -
 C4/Installer/PerlDependencies.pm                   |    5 -
 C4/Members.pm                                      |  256 ++++++++-----------
 C4/Members/Attributes.pm                           |   13 +-
 C4/Print.pm                                        |    1 -
 C4/Reserves.pm                                     |    3 +-
 C4/SQLHelper.pm                                    |   77 +++++--
 INSTALL                                            |    2 +-
 Makefile.PL                                        |    2 +-
 admin/aqbudget_owner_search.pl                     |    2 +-
 catalogue/showmarc.pl                              |   51 ++--
 cataloguing/addbiblio.pl                           |    8 +-
 circ/circulation.pl                                |    2 +-
 circ/overdue.pl                                    |   11 +-
 circ/ysearch.pl                                    |   29 +--
 debian/scripts/koha-stop-zebra                     |    2 +-
 install_misc/debian.packages                       |   28 +++
 installer/InstallAuth.pm                           |    8 +-
 .../de-DE/mandatory/message_transport_types.txt    |    3 +-
 .../data/mysql/de-DE/mandatory/subtag_registry.txt |    7 +-
 installer/data/mysql/de-DE/mandatory/userflags.txt |    2 +-
 .../marc21/mandatory/authorities_normal_marc21.txt |    9 +-
 .../optional/marc21_default_matching_rules.txt     |    4 +-
 .../marc21/optional/marc21_fastadd_framework.txt   |    2 +-
 .../optional/marc21_simple_bib_frameworks.txt      |    3 +-
 installer/data/mysql/de-DE/optional/auth_val.txt   |    2 +-
 .../mysql/de-DE/optional/patron_categories.txt     |   12 +-
 .../mysql/de-DE/optional/sample_creator_data.txt   |    2 +-
 .../data/mysql/de-DE/optional/sample_news.txt      |    2 +-
 .../mysql/de-DE/optional/sample_z3950_servers.txt  |    1 +
 installer/data/mysql/kohastructure.sql             |   11 +
 installer/data/mysql/updatedatabase.pl             |    7 +
 .../prog/en/modules/acqui/orderreceive.tt          |    4 +-
 .../prog/en/modules/admin/aqbudgets.tt             |    1 +
 .../prog/en/modules/cataloguing/addbiblio.tt       |   13 +-
 .../prog/en/modules/reserve/request.tt             |   16 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    4 +-
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    6 +
 koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc  |    4 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    8 +-
 kohaversion.pl                                     |    2 +-
 members/guarantor_search.pl                        |   11 +-
 members/member.pl                                  |   19 +-
 misc/cronjobs/cleanup_database.pl                  |   25 ++-
 misc/migration_tools/merge_authority.pl            |   18 +-
 opac/opac-showmarc.pl                              |   16 +-
 opac/sco/sco-main.pl                               |    4 +-
 patroncards/members-search.pl                      |   14 +-
 reserve/placerequest.pl                            |   22 +-
 reserve/request.pl                                 |   93 ++++----
 t/db_dependent/Koha.t                              |   14 +-
 t/db_dependent/Members.t                           |  181 ++++++++++----
 t/db_dependent/lib/KohaTest/Branch.pm              |    1 -
 t/db_dependent/lib/KohaTest/Members.pm             |    2 +-
 tools/import_borrowers.pl                          |    4 +
 59 files changed, 615 insertions(+), 513 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 26 02:00:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 26 Oct 2011 00:00:38 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-122-gbb3fae1
Message-ID: <E1RIqv8-00020h-5K@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  bb3fae14950ef013bb55c4d2d1b12558b12ade0a (commit)
       via  07ce7d8d3b3d3144ce088729e2b402cc6eaeeba5 (commit)
       via  01d01b02a2149bdacf27489d718d7a4250e007ad (commit)
       via  b340aa213e9c9a6be143ee4919940c903f163565 (commit)
      from  61ea6ad38827262c378729a25beac83d9ad2cf49 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bb3fae14950ef013bb55c4d2d1b12558b12ade0a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 14 16:37:54 2011 -0400

    Bug 5995 Followup: checkpw was returning inconsistent values
    
    In the case of LDAP, checkpw was returning the cardnumber of there user, but it was being treated as the
    userid.  This patch updates checkpw_ldap to return the cardnumber AND the userid, and updates checkpw to
    uniformly return cardnumber and userid in all instances, so that whoever is authenticating can use the
    desired value in the right way.
    (cherry picked from commit dcb4ac77fbfd813cc0eb39e060b49a7b8d491016)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 07ce7d8d3b3d3144ce088729e2b402cc6eaeeba5
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date:   Fri Feb 5 12:00:15 2010 +0100

    Bug 5995 : MT2892: Fix security issue in CAS intranet login
    
    Users could log in intranet using their cardnumber, with superlibrarian
    rights.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 01d01b02a2149bdacf27489d718d7a4250e007ad
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Tue Sep 6 16:07:49 2011 +1200

    bug_6770: removed doubled override increment when using AllowHoldPolicyOverride
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b340aa213e9c9a6be143ee4919940c903f163565
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Oct 20 14:21:26 2011 +1300

    bug_5533: Improved marking items as lost
    
    Call LostItem() whenever an item is lost
    Disable lost status on catalogue item edit
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 C4/Accounts.pm                             |   77 ++++++++-------------------
 C4/Circulation.pm                          |   40 ++++++++++++++-
 C4/Items.pm                                |    8 +++-
 catalogue/updateitem.pl                    |    3 +-
 cataloguing/additem.pl                     |   37 ++++++++-----
 misc/cronjobs/longoverdue.pl               |    3 +-
 reserve/request.pl                         |   16 ++----
 t/db_dependent/lib/KohaTest/Accounts.pm    |    1 -
 t/db_dependent/lib/KohaTest/Circulation.pm |    1 +
 tools/batchMod.pl                          |   16 +++++-
 10 files changed, 112 insertions(+), 90 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 26 02:16:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 26 Oct 2011 00:16:22 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-124-gc9fc4d9
Message-ID: <E1RIrAM-0002Lc-Od@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  c9fc4d92f175f1d39d6d059453eab7be1c1ae308 (commit)
       via  ef382d825227eb24e7154c949bf83f1d491291da (commit)
      from  bb3fae14950ef013bb55c4d2d1b12558b12ade0a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c9fc4d92f175f1d39d6d059453eab7be1c1ae308
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Tue Oct 25 20:06:11 2011 -0400

    Updating Version Number to 3.04.05.003
    
    Also fixing up two typos in db version numbers

commit ef382d825227eb24e7154c949bf83f1d491291da
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Sep 23 14:50:08 2011 +1200

    Bug 6905: [3.4.x] change which page clicking users in circ history takes you to
    
    Adds a syspref (borrowerhistorylink) that allows you to choose where
    links to borrowers on the item circulation page go, choosing between the
    circ page for them, or their details page. Default is the current
    behaviour (go the the circ page.)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 catalogue/moredetail.pl                            |   12 +++++++++---
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    1 +
 installer/data/mysql/en/mandatory/sysprefs.sql     |    1 +
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    1 +
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    1 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 +++++++++-
 .../en/modules/admin/preferences/circulation.pref  |    6 ++++++
 .../prog/en/modules/catalogue/moredetail.tt        |    6 +++---
 kohaversion.pl                                     |    2 +-
 12 files changed, 35 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Oct 26 16:56:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 26 Oct 2011 14:56:46 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-125-gca0264d
Message-ID: <E1RJ4uL-0005Zq-GM@git.koha-community.org>

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.4.x has been updated
       via  ca0264de48df008b81c9237d71e429f2a35a75f4 (commit)
      from  c9fc4d92f175f1d39d6d059453eab7be1c1ae308 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ca0264de48df008b81c9237d71e429f2a35a75f4
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 26 10:56:26 2011 -0400

    Removing merge conflict markers

-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/modules/circ/circulation.tt            |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository