From gitmaster at git.koha-community.org  Fri Nov  4 07:24:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 06:24:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-1-ga867bfc
Message-ID: <E1RMDCR-0003qC-OI@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  a867bfcff7201a7fa3b56bee4dd484a49ece35e3 (commit)
      from  52c666edce4261a1acafaa34b2c8a2431589ac0c (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 a867bfcff7201a7fa3b56bee4dd484a49ece35e3
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 28 14:08:00 2011 -0400

    Fix for Bug 5974 - Bogus auth check for "StaffMember" role
    
    Also removing some YAHOO.widget.Button declarations which
    are redundant.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/includes/circ-toolbar.inc              |   30 +++----------------
 .../prog/en/includes/members-toolbar.inc           |    8 +----
 2 files changed, 7 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 07:44:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 06:44:08 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6955
	created. v3.06.00-1-gc7fc0fc
Message-ID: <E1RMDVY-000492-5p@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_6955 has been created
        at  c7fc0fc5cf2d491adb915247cb86e65811b8852b (commit)

- Log -----------------------------------------------------------------
commit c7fc0fc5cf2d491adb915247cb86e65811b8852b
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 3 08:59:18 2011 -0400

    Fix for Bug 6955, Toolbar on reading history broken
    
    Table sorter script causes error if there is no <tbody> to sort.
    JS errors cause the YUI toolbar js to abort, causing the problem
    observed. When there are no results the whole table should be
    omitted and a message displayed in its place.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To test:
    - check toolbar on top of patron reading history with no entries
    - check toolbar on top of patron reading history after a few checkouts
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 07:47:15 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 06:47:15 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-2-g7a82e50
Message-ID: <E1RMDYZ-0004B4-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, master has been updated
       via  7a82e508f020aed3691222e08695a0f7cfd86b48 (commit)
      from  a867bfcff7201a7fa3b56bee4dd484a49ece35e3 (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 7a82e508f020aed3691222e08695a0f7cfd86b48
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 4 19:46:45 2011 +1300

    Sorry pushed this by mistake when trying to fix Pauls permissions
    
    Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
    
    This reverts commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3.

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

Summary of changes:
 .../prog/en/includes/circ-toolbar.inc              |   30 ++++++++++++++++---
 .../prog/en/includes/members-toolbar.inc           |    8 ++++-
 2 files changed, 31 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 07:59:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 06:59:42 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6414
	created. v3.06.00-1-g014ccc2
Message-ID: <E1RMDkc-0004E3-0w@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_6414 has been created
        at  014ccc250cc5305696bdfee813785b982c1aaf04 (commit)

- Log -----------------------------------------------------------------
commit 014ccc250cc5305696bdfee813785b982c1aaf04
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Sep 21 14:15:39 2011 -0400

    Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
    
    http://bugs.koha-community.org/show_bug.cgi?id=6414
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Signed off with a note: this doesn't fix everything mentioned in the bug.
    It also might clash with bug 4831 and should be tested with that patch.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 08:01:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 07:01:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6895
	created. v3.06.00-5-gba1ac13
Message-ID: <E1RMDmi-0004G3-SV@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_6895 has been created
        at  ba1ac1334b80170f39ecf6d1e02261be40d72793 (commit)

- Log -----------------------------------------------------------------
commit ba1ac1334b80170f39ecf6d1e02261be40d72793
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 5 16:39:08 2011 +1300

    Bug 6895 : First attempt at fixing the diacritics bug
    
    This is a fairly hacky solution, a counter patch would be more than
    welcome
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Updated, translated and installed German po files after applying this patch.
    No problems found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 215d80ec35a6682acc53416d3a77f139e5e096fa
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Oct 19 15:28:16 2011 -0400

    Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=7069
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch changes '' to "" to make it work for strings which contain '.
    Patch does NOT add new strings to the po files.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 092f2241ab5512eba9cc733cb7cac5c4dd1d834f
Merge: c7fc0fc 014ccc2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 4 06:53:34 2011 +0100

    Merge branch 'new/bug_6414'

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 08:03:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 07:03:35 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-6-gafaf7ea
Message-ID: <E1RMDoN-0004Gx-A6@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  afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685 (commit)
       via  7ff9d9d03cc0efd07a8667b093927af4a9c3fb29 (commit)
       via  54226b60f3e31ba52d6be88eeebcaf534ada296f (commit)
       via  0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5 (commit)
      from  7a82e508f020aed3691222e08695a0f7cfd86b48 (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 afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 5 16:39:08 2011 +1300

    Bug 6895 : First attempt at fixing the diacritics bug
    
    This is a fairly hacky solution, a counter patch would be more than
    welcome
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Updated, translated and installed German po files after applying this patch.
    No problems found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 7ff9d9d03cc0efd07a8667b093927af4a9c3fb29
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Oct 19 15:28:16 2011 -0400

    Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=7069
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch changes '' to "" to make it work for strings which contain '.
    Patch does NOT add new strings to the po files.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 54226b60f3e31ba52d6be88eeebcaf534ada296f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 3 08:59:18 2011 -0400

    Fix for Bug 6955, Toolbar on reading history broken
    
    Table sorter script causes error if there is no <tbody> to sort.
    JS errors cause the YUI toolbar js to abort, causing the problem
    observed. When there are no results the whole table should be
    omitted and a message displayed in its place.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To test:
    - check toolbar on top of patron reading history with no entries
    - check toolbar on top of patron reading history after a few checkouts
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Sep 21 14:15:39 2011 -0400

    Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
    
    http://bugs.koha-community.org/show_bug.cgi?id=6414
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Signed off with a note: this doesn't fix everything mentioned in the bug.
    It also might clash with bug 4831 and should be tested with that patch.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

Summary of changes:
 acqui/neworderempty.pl                             |    1 +
 .../prog/en/modules/acqui/neworderempty.tt         |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    2 +-
 .../en/modules/cataloguing/value_builder/macles.tt |    2 +-
 .../prog/en/modules/installer/auth.tt              |    2 +-
 .../prog/en/modules/members/readingrec.tt          |    5 ++++-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   10 +++++-----
 misc/translator/xgettext.pl                        |    2 +-
 8 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 10:23:27 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 09:23:27 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6963
	created. v3.06.00-8-g61e1eee
Message-ID: <E1RMFzj-0004oI-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_6963 has been created
        at  61e1eeee84083f835a85d43128f4b6cbeef636dd (commit)

- Log -----------------------------------------------------------------
commit 61e1eeee84083f835a85d43128f4b6cbeef636dd
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 17 16:01:29 2011 -0400

    Follow-up patch : use the subfield associated with items.barcode
    
    Instead of using the 'p' subfield directly, use the subfield letter
    associated with the items.barcode column.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Test cases tested:
    - 1 item, barcode empty
    - 2 items, barcodes both empty
    - 1 item, existing barcode
    - 1 item, new barcode
    - 2 items, one barcode empty, one existing
    
    All test cases worked nicely and gave correct error messages.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 3 15:00:05 2011 -0400

    Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
    
    If the AcqCreateItem preference is set to "ordering" and the barcode for
    the new item is already in use, no error is returned, but an invalid
    itemnumber is saved in the aqorders_items table and the item is never
    created.
    
    This patch adds a duplicate barcode verification in neworderempty.pl
    _koha_add_item is also modified so it won't return an invalid ID when
    an item can't be added.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan on second patch.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 10:24:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 09:24:30 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-8-g61e1eee
Message-ID: <E1RMG0k-0004pT-I4@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  61e1eeee84083f835a85d43128f4b6cbeef636dd (commit)
       via  327be442bd6e63e5ff8c0a5e2461ae836e8deffb (commit)
      from  afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685 (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 +++-
 .../check_duplicate_barcode_ajax.pl                |   44 +++++++++++-------
 acqui/neworderempty.pl                             |    4 ++
 .../prog/en/modules/acqui/neworderempty.tt         |   48 ++++++++++++++++++-
 4 files changed, 81 insertions(+), 22 deletions(-)
 copy tools/upload-file-progress.pl => acqui/check_duplicate_barcode_ajax.pl (51%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 10:35:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 09:35:58 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7076
	created. v3.06.00-9-ga0a9368
Message-ID: <E1RMGBq-0004t5-D0@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_7076 has been created
        at  a0a9368beccd1748e720966f25869259a30e68f2 (commit)

- Log -----------------------------------------------------------------
commit a0a9368beccd1748e720966f25869259a30e68f2
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 11:43:17 2011 -0400

    Bug 7076: Lists render OPAC XSLT on staff side
    
    Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
    OPACResultsXSLT if the $type is 'opac'.  Since parsing the XML is such an expensive
    thing, and the resulting XSLTBloc is not used on the staff side, this will increase
    performance for Lists in the intranet
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 10:37:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 09:37:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-9-ga0a9368
Message-ID: <E1RMGD0-0004uO-Q3@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  a0a9368beccd1748e720966f25869259a30e68f2 (commit)
      from  61e1eeee84083f835a85d43128f4b6cbeef636dd (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/VirtualShelves/Page.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 11:53:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 10:53:06 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5885
	created. v3.06.00-10-gcc6c1ac
Message-ID: <E1RMHOU-00059D-4R@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_5885 has been created
        at  cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef (commit)

- Log -----------------------------------------------------------------
commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 15 14:05:04 2010 +0100

    Bug 5885 : UNIMARC XSLT changes
    
    dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    I can't test this works ok for UNIMARC, but it does not cause any
    problems with the translation scripts or MARC21 so signing off

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 11:53:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 10:53:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-10-gcc6c1ac
Message-ID: <E1RMHOy-00059z-He@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  cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef (commit)
      from  a0a9368beccd1748e720966f25869259a30e68f2 (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/UNIMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 12:07:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 11:07:42 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6989
	created. v3.06.00-11-gd998166
Message-ID: <E1RMHcc-0005DE-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, new/bug_6989 has been created
        at  d998166ea30e9d798c97d457afe39c748eed38ae (commit)

- Log -----------------------------------------------------------------
commit d998166ea30e9d798c97d457afe39c748eed38ae
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Oct 8 15:30:59 2011 +0200

    Bug 6989 Patron categories not properly displayed if not pure ASCII
    
    C4::Category module returns badly encoded patron categories when they are
    containing non pure-ASCII characters.
    
    To reproduce this bug:
    
      - Go in Administration > Patron Categories
      - Add a new category. Give it this code for example:
        Caf?
      - Click on Patrons link on top menu
      - Click on New button
    
        => You get 'Caf?' displayed without accent
    
    Signed-off-by: Piotr Wejman <ropuch at bagno.be>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 12:08:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 11:08:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-11-gd998166
Message-ID: <E1RMHdG-0005E0-4k@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  d998166ea30e9d798c97d457afe39c748eed38ae (commit)
      from  cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef (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/Category.pm |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 12:21:47 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 11:21:47 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7061
	created. v3.06.00-12-g36d8e5d
Message-ID: <E1RMHqF-0005HK-Oc@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_7061 has been created
        at  36d8e5df96d17df3d19a4693fff2ba52504fae51 (commit)

- Log -----------------------------------------------------------------
commit 36d8e5df96d17df3d19a4693fff2ba52504fae51
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 20:17:17 2011 -0400

    Bug 7061: unnecessary global variables declared in C4::SQLHelper
    
    Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
    all instances of $table are locally scoped to the subroutines, and $hash is never used.
    
    This may help with persistance; if not, it's at least a bit of trivial cleanup.
    
    To test:
    
    1.  Search for a patron
    2.  Create a Contract in Acquisitions
    3.  Modify that Contract
    4.  Delete that Contract
    
    All instances should return error free.  This checks the subroutines of SQLHelper
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 12:22:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 11:22:35 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-12-g36d8e5d
Message-ID: <E1RMHr1-0005II-9b@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  36d8e5df96d17df3d19a4693fff2ba52504fae51 (commit)
      from  d998166ea30e9d798c97d457afe39c748eed38ae (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/SQLHelper.pm |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov  4 12:52:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 04 Nov 2011 11:52:04 +0000
Subject: [koha-commits] main Koha release repository branch
	new/testing_please_ignore created. v3.06.00-12-g36d8e5d
Message-ID: <E1RMIJY-0005SN-Lw@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/testing_please_ignore has been created
        at  36d8e5df96d17df3d19a4693fff2ba52504fae51 (commit)

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 10:17:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 09:17:58 +0000
Subject: [koha-commits] main Koha release repository branch new/test_push
	created. v3.06.00-12-g36d8e5d
Message-ID: <E1RMyrW-0005c1-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, new/test_push has been created
        at  36d8e5df96d17df3d19a4693fff2ba52504fae51 (commit)

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 10:24:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 09:24:12 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7085
	created. v3.06.00-14-g0c0ddf9
Message-ID: <E1RMyxY-0005ev-2k@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_7085 has been created
        at  0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48 (commit)

- Log -----------------------------------------------------------------
commit 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Oct 25 10:16:02 2011 -0400

    Fix for Bug 7085 - Problems with searching for orders in acquisitions
    
    Changing "if ( defined $input )" to "if ( $input )" in the section
    of the script which builds the order search query seems to give
    successful searches where they didn't exist before. Searches from
    the advanced order search screen work with title, author, vendor,
    basket number, date, etc.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Searches for date ranges, title and author keywords give
    me the correct results now.

commit 0038b0df15a838468bf7c23a389c260075dfd1c4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Nov 4 14:56:50 2011 -0400

    Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
    
    Fixing two stray instances of "supplier."

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 10:28:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 09:28:13 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-14-g0c0ddf9
Message-ID: <E1RMz1R-0005gp-2X@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  0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48 (commit)
       via  0038b0df15a838468bf7c23a389c260075dfd1c4 (commit)
      from  36d8e5df96d17df3d19a4693fff2ba52504fae51 (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                                  |   12 ++++++------
 .../prog/en/modules/acqui/supplier.tt              |    2 +-
 .../prog/en/modules/serials/claims.tt              |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 10:49:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 09:49:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6471
	created. v3.06.00-15-g0ea8ff7
Message-ID: <E1RMzLf-0005l2-KV@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_6471 has been created
        at  0ea8ff7c4c81c183ba8da64d7939b041c7de8301 (commit)

- Log -----------------------------------------------------------------
commit 0ea8ff7c4c81c183ba8da64d7939b041c7de8301
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 20 09:22:46 2011 -0400

    Bug 6471: add tablesorter to Holds Queue
    
    This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 10:49:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 09:49:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-15-g0ea8ff7
Message-ID: <E1RMzMU-0005lo-D5@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  0ea8ff7c4c81c183ba8da64d7939b041c7de8301 (commit)
      from  0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48 (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/view_holdsqueue.tt        |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:37:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:37:03 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6978
	created. v3.06.00-16-ge676e11
Message-ID: <E1RN063-000623-GQ@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_6978 has been created
        at  e676e117fccfaa8208742c17a08cb92056286f95 (commit)

- Log -----------------------------------------------------------------
commit e676e117fccfaa8208742c17a08cb92056286f95
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Wed Oct 5 15:12:04 2011 -0400

    Notify the user on his account page when his account is almost expired
    
    New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
    notification appears in the user's account page if his subscription is almost
    expired.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6978
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    works perfectly with date formatted DD/MM/YYYY as well

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:39:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:39:03 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-16-ge676e11
Message-ID: <E1RN07z-00062q-Il@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  e676e117fccfaa8208742c17a08cb92056286f95 (commit)
      from  0ea8ff7c4c81c183ba8da64d7939b041c7de8301 (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/modules/opac-user.tt |    6 ++++++
 opac/opac-user.pl                                |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:44:05 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:44:05 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6994
	created. v3.06.00-17-g488f4be
Message-ID: <E1RN0Cr-00063w-8W@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_6994 has been created
        at  488f4be86537211214ede7e0e703128c0cc4c92f (commit)

- Log -----------------------------------------------------------------
commit 488f4be86537211214ede7e0e703128c0cc4c92f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 20:59:57 2011 +0200

    Bug 6994: Wrong 'no budget defined' alert
    
    When ordering from an existing record the 'no budgets and funds defined' error
    message was shown below the result list.
    
    To test:
    A) No budgets defined for this user and library
    Basket summary page shows a warning instead of the link for creation
    of orders.
    
    B) Budgets and funds are properly defined for this user and library
    Basket summary page shows links for order creation.
    Before patch: A search for an existing record had the alert at the bottom
    of the search result list.
    After patch: The links for creation of orders are shown instead.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified A and B.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:44:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:44:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-17-g488f4be
Message-ID: <E1RN0Da-000657-CY@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  488f4be86537211214ede7e0e703128c0cc4c92f (commit)
      from  e676e117fccfaa8208742c17a08cb92056286f95 (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/neworderbiblio.pl                            |   18 ++++++++++++++++--
 .../en/includes/acquisitions-add-to-basket.inc     |    2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:54:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:54:32 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7117
	created. v3.06.00-14-ge660cef
Message-ID: <E1RN0My-00067J-Fj@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_7117 has been created
        at  e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b (commit)

- Log -----------------------------------------------------------------
commit e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 31 01:06:17 2011 +0100

    Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
    
    To test:
    1) Add some suggestions
    2) Go to suggestions in staff
    3) Choose from filters 'suggested by' or 'managed by'
    4) Compare names shown on tabs with names in list of suggestions
    
    Before patch: tab name has the wrong order, while list name is correct.
    After patch: all names should be consistent and correct.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 11:55:17 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 10:55:17 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-19-g30d0be7
Message-ID: <E1RN0Nh-00068e-19@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  30d0be703964be0ae8610e04c903ab2170bca228 (commit)
       via  e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b (commit)
      from  488f4be86537211214ede7e0e703128c0cc4c92f (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 30d0be703964be0ae8610e04c903ab2170bca228
Merge: 488f4be e660cef
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 11:54:53 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_7117'

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 12:00:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 11:00:01 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7128
	created. v3.06.00-20-g4ccb864
Message-ID: <E1RN0SH-00069y-40@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_7128 has been created
        at  4ccb8649f88abaf9012f1bbec06fc840046cb7ff (commit)

- Log -----------------------------------------------------------------
commit 4ccb8649f88abaf9012f1bbec06fc840046cb7ff
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Nov 1 14:01:17 2011 -0500

    Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
    
    To test:
    verify that the loggedin id is added when user is logged in
    verify that the notloggedin id is evident when no user is logged in.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Bug 7128 : Follow up, adding the id to the case when a user is not logged in
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 12:00:26 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 11:00:26 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-20-g4ccb864
Message-ID: <E1RN0Sg-0006B4-Dr@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  4ccb8649f88abaf9012f1bbec06fc840046cb7ff (commit)
      from  30d0be703964be0ae8610e04c903ab2170bca228 (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/modules/opac-main.tt |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 12:04:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 11:04:29 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7146
	created. v3.06.00-14-g7ee0565
Message-ID: <E1RN0Wb-0006Cj-Oe@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_7146 has been created
        at  7ee0565f5ce75fac16de2dc06c170bc06a171e56 (commit)

- Log -----------------------------------------------------------------
commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Nov 3 13:41:24 2011 +0100

    7146 (Update timestamps when deleting a biblio)
    
    Currently, when you delete an item, the timestamp column in deleteditems is
    updated with current time. (This comes from an [unintentional] additional
    update statement in DelItem.) It makes deletion time visible.
    In the past, the marcxml was updated too at that moment, resulting in an
    updated timestamp in biblioitems too. The timestamp in biblio was not touched.
    
    If you delete a biblio however, the timestamps in deletedbiblio and
    deletedbiblioitems do not reflect time of deletion. They still show the time of
    last update before the record was deleted. This last update can be extracted
    from MARC field 005 too.
    
    This behavior is not consistent nor logical. I would suggest to add a statement
    in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
    makes the time of deletion visible in the record too. The time of deletion of a
    biblio can be very useful for e.g. synchronizing purposes.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 12:04:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 11:04:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-22-g1e5347f
Message-ID: <E1RN0Wz-0006DV-41@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  1e5347fb34d6adf94ee7db0375145e28267f4bc9 (commit)
       via  7ee0565f5ce75fac16de2dc06c170bc06a171e56 (commit)
      from  4ccb8649f88abaf9012f1bbec06fc840046cb7ff (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 1e5347fb34d6adf94ee7db0375145e28267f4bc9
Merge: 4ccb864 7ee0565
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 12:04:43 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_7146'

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 15:41:51 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 14:41:51 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7184
	created. v3.06.00-23-g016e66c
Message-ID: <E1RN3ux-0006uu-Jb@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_7184 has been created
        at  016e66c6f25fbe3b648bcb8dad8d59f80d11b992 (commit)

- Log -----------------------------------------------------------------
commit 016e66c6f25fbe3b648bcb8dad8d59f80d11b992
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 09:36:52 2011 +0100

    Bug 7184 raise mySQL error if debug is set
    
    Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
    With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error
    
    Step to test:
    === BEFORE PATCH ===
    go anywhere, and change a mySQL statement to make it invalid.
    Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results
    
    === AFTER PATCH ===
    Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
    SetEnv DEBUG 1
    restart/reload Apache
    Launch the same page, you'll get a Perl statement saying something like:
    
    DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 15:42:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 14:42:39 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-23-g016e66c
Message-ID: <E1RN3vj-0006vh-Pf@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  016e66c6f25fbe3b648bcb8dad8d59f80d11b992 (commit)
      from  1e5347fb34d6adf94ee7db0375145e28267f4bc9 (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/Context.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 15:44:29 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 14:44:29 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-24-ge228f23
Message-ID: <E1RN3xV-0006wZ-46@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  e228f233e4638fdbeb77495fafb8453045d43302 (commit)
      from  016e66c6f25fbe3b648bcb8dad8d59f80d11b992 (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 e228f233e4638fdbeb77495fafb8453045d43302
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Sun Nov 6 14:14:40 2011 +0530

    Bug 7185: Fix updatedatabase message for 3.6.0 release
    
    Signed-off-by: Fran?ois Charbonnier <francois.charbonnier at biblibre.com>

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 15:50:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 14:50:16 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7188
	created. v3.06.00-25-g0f8db0c
Message-ID: <E1RN436-0006yf-NX@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_7188 has been created
        at  0f8db0c53866afaf5171869359c558d1e9f4325e (commit)

- Log -----------------------------------------------------------------
commit 0f8db0c53866afaf5171869359c558d1e9f4325e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:58:41 2011 +0200

    Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
    
    Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
    As we don't support anything outside from mysql, returning directly mysql directly
    
    If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway
    
    Testing note:
    Drops execution time of the line from 300ms to 20 microseconds (in my testing).

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 15:51:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 14:51:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-25-g0f8db0c
Message-ID: <E1RN43p-0006zU-6N@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  0f8db0c53866afaf5171869359c558d1e9f4325e (commit)
      from  e228f233e4638fdbeb77495fafb8453045d43302 (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/Context.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 17:56:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 16:56:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6390
	updated. v3.04.00-727-g58bdfdb
Message-ID: <E1RN60q-0007M5-A2@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  58bdfdb08883eb52777321f883491eaff1493857 (commit)
      from  bc33391fc5491e0acbc9431d3a6b24c4f357ff79 (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 58bdfdb08883eb52777321f883491eaff1493857
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 16:13:15 2011 -0400

    Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber
    
    aqbasket.authorisedby is not foreign key constrainted to borrowers.borrowernumber,
    so if it's anything other than that, vendor search breaks by using an undefined value
    (GetMember() on an invalid borrowernumber) as a HASH ref.
    
    This patch sets the branchcode (the desired value from GetMember) to a blank value, then only
    changes it if GetMember is defined.  In the case where the authorisedby librarian has been deleted,
    or the value is otherwise invalid, and AcqViewBaskets is set to 'branch', the basket will not appear
    except to superlibrarians
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Invalid borrowernumber in aqbasket.authorisedby no longer breaks search.

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

Summary of changes:
 acqui/booksellers.pl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 17:58:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 16:58:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-27-gbfc3ea8
Message-ID: <E1RN634-0007NN-0y@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  bfc3ea8cc4f0746d4d5658d7c2e2353855bd2b29 (commit)
       via  58bdfdb08883eb52777321f883491eaff1493857 (commit)
      from  0f8db0c53866afaf5171869359c558d1e9f4325e (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 bfc3ea8cc4f0746d4d5658d7c2e2353855bd2b29
Merge: 0f8db0c 58bdfdb
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 17:56:36 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_6390'

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

Summary of changes:
 acqui/booksellers.pl |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 18:22:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 17:22:00 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-32-g3b04749
Message-ID: <E1RN6Pw-0007TB-6n@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  3b0474950c791bbf0367f6c819203180205f7aa8 (commit)
       via  21e4d79be8b0a7204dd592528e20f5b8e29553ee (commit)
       via  e8ea58270dc08aac8c1eaccc59e17d96daf56860 (commit)
       via  607b5449bd5cb79dd8964e46bb970c3975497969 (commit)
       via  6bb73a04c4c67e5b14eb209ec56ae6585547c593 (commit)
      from  bfc3ea8cc4f0746d4d5658d7c2e2353855bd2b29 (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 3b0474950c791bbf0367f6c819203180205f7aa8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:27:48 2011 +1300

    Bug 6679 : Tidying changed parts of file
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 21e4d79be8b0a7204dd592528e20f5b8e29553ee
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:24:05 2011 +1300

    Bug 6679 : Don't declare variables in conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit e8ea58270dc08aac8c1eaccc59e17d96daf56860
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:19:36 2011 +1300

    Bug 6679 : Not using strict .. bad script, no cookie for you!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 607b5449bd5cb79dd8964e46bb970c3975497969
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:13:20 2011 +1300

    Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 6bb73a04c4c67e5b14eb209ec56ae6585547c593
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:00:01 2011 +1300

    Bug 6679 : Declare variables outside of conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

Summary of changes:
 cataloguing/value_builder/dateaccessioned.pl   |    4 +-
 cataloguing/value_builder/macles.pl            |  123 ++++++++++++++----------
 cataloguing/value_builder/unimarc_field_4XX.pl |   15 ++-
 labels/label-create-pdf.pl                     |   10 +-
 labels/label-create-xml.pl                     |   27 +++++-
 labels/label-edit-batch.pl                     |    9 +-
 labels/label-print.pl                          |   15 ++-
 7 files changed, 127 insertions(+), 76 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov  6 18:29:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 06 Nov 2011 17:29:43 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-33-gee0627f
Message-ID: <E1RN6XP-0007VG-P1@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  ee0627f20bee5df234ab284d1fdacebb857de57f (commit)
      from  3b0474950c791bbf0367f6c819203180205f7aa8 (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 ee0627f20bee5df234ab284d1fdacebb857de57f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 31 20:57:19 2011 +1300

    Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    tested with diacritics, no changes before and after the patch

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

Summary of changes:
 admin/aqplan.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 17:09:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:09:45 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7138
	created. v3.06.00-35-g7a3dc51
Message-ID: <E1ROAif-00051p-10@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_7138 has been created
        at  7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248 (commit)

- Log -----------------------------------------------------------------
commit 7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Nov 3 00:44:36 2011 +0100

    Bug 7138: Can't print basket group order pdf
    
    PDF print of basket groups is broken.
    
    To test:
    
    1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
    2) Create a basket with orders
    3) Close the basket and create a basket group checking the checkbox
    4) Print the basket group as PDF
    
    Before patch the file is broken and when opened in an editor contains an error message.
    After the patch the PDF should be generated correctly again.
    
    Thx to Chris for helping me to fix the problem.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Thu Mar 25 11:37:19 2010 +0100

    Bug 6015 : Improving load_testing
    
    Adding a benchmark for OPAC
    it tests :
     - mainpage
     - search page
     - detail page
    
    Staff :
    Adding a test on member searches

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 17:18:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:18:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-35-g7a3dc51
Message-ID: <E1ROAr6-00054r-P4@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  7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248 (commit)
       via  47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc (commit)
      from  ee0627f20bee5df234ab284d1fdacebb857de57f (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/basketgroup.pl                       |    2 +-
 misc/load_testing/benchmark_circulation.pl |   39 ++++++++-
 misc/load_testing/benchmark_opac.pl        |  128 ++++++++++++++++++++++++++++
 3 files changed, 163 insertions(+), 6 deletions(-)
 create mode 100755 misc/load_testing/benchmark_opac.pl


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 17:22:20 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:22:20 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5945
	created. v3.06.00-36-gc3abbed
Message-ID: <E1ROAup-00056J-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_5945 has been created
        at  c3abbedebedd34948b664a4d2a6b34dc4863802d (commit)

- Log -----------------------------------------------------------------
commit c3abbedebedd34948b664a4d2a6b34dc4863802d
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Nov 4 06:26:01 2011 -0400

    Bug 5945: email not searchable in patron search
    
    Adds 'email' to valid search parameters in members/member.pl
    
    To test:
    1. give a patron a unique email address in your test database
    2. search on the full email; should work
    3. search on the part of the email before the domain; should work
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 17:25:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:25:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-36-gc3abbed
Message-ID: <E1ROAxe-00058M-JU@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  c3abbedebedd34948b664a4d2a6b34dc4863802d (commit)
      from  7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248 (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:
 members/member.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 17:29:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:29:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-37-g93e597b
Message-ID: <E1ROB2E-0005AU-D9@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  93e597b5ea5fc23c737c6e0e8bb42f763e3125d5 (commit)
      from  c3abbedebedd34948b664a4d2a6b34dc4863802d (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 93e597b5ea5fc23c737c6e0e8bb42f763e3125d5
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Nov 9 17:29:17 2011 +0100

    Revert "Bug 6015 : Improving load_testing"
    
    sorry, was not supposed to be pushed (follow-up needed)
    
    This reverts commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc.

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

Summary of changes:
 misc/load_testing/benchmark_circulation.pl |   39 +--------
 misc/load_testing/benchmark_opac.pl        |  128 ----------------------------
 2 files changed, 5 insertions(+), 162 deletions(-)
 delete mode 100755 misc/load_testing/benchmark_opac.pl


hooks/post-receive
-- 
main Koha release repository

From paul.poulain at biblibre.com  Wed Nov  9 17:31:29 2011
From: paul.poulain at biblibre.com (Paul Poulain)
Date: Wed, 09 Nov 2011 17:31:29 +0100
Subject: [koha-commits] main Koha release repository branch master
 updated. v3.06.00-35-g7a3dc51
In-Reply-To: <E1ROAr6-00054r-P4@git.koha-community.org>
References: <E1ROAr6-00054r-P4@git.koha-community.org>
Message-ID: <4EBAAAE1.3030606@biblibre.com>

Le 09/11/2011 17:18, Git repo owner a ?crit :
>  acqui/basketgroup.pl                       |    2 +-
(this one is OK)

>  misc/load_testing/benchmark_circulation.pl |   39 ++++++++-
>  misc/load_testing/benchmark_opac.pl        |  128 ++++++++++++++++++++++++++++
Yikes, sorry I was not supposed to push load_testing stuff at this
time... I made some mistake in git. reverting it immediatly
-- 
Paul POULAIN
http://www.biblibre.com
Expert en Logiciels Libres pour l'info-doc
Tel : (33) 4 91 81 35 08

From gitmaster at git.koha-community.org  Wed Nov  9 17:51:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 16:51:39 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-127-g96979f5
Message-ID: <E1ROBND-0005GQ-5N@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  96979f5f586d9debf2481a71166f4fee885f8903 (commit)
       via  9155d6e90dbeacd2b43454da05f6050fc4bc3fff (commit)
      from  ca0264de48df008b81c9237d71e429f2a35a75f4 (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 96979f5f586d9debf2481a71166f4fee885f8903
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Nov 9 11:50:37 2011 -0500

    Release Notes for 3.04.06.000

commit 9155d6e90dbeacd2b43454da05f6050fc4bc3fff
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Fri Nov 4 07:38:45 2011 +0100

    3.4.6 Translation Update
    (cherry picked from commit 2bc8e34587ea9402eead735700833a84ce3c5854)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 misc/release_notes/release_notes_3_4_6.txt         |  224 +
 .../po/am-Ethi-i-opac-t-prog-v-3002000.po          |  139 +-
 .../po/am-Ethi-i-staff-t-prog-v-3002000.po         | 3305 +-
 misc/translator/po/am-Ethi-pref.po                 |   16 +
 .../po/ar-Arab-i-opac-t-prog-v-3002000.po          |  139 +-
 .../po/ar-Arab-i-staff-t-prog-v-3002000.po         | 3363 +-
 misc/translator/po/ar-Arab-pref.po                 |   16 +
 .../translator/po/az-AZ-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/az-AZ-i-staff-t-prog-v-3002000.po           | 3366 +-
 misc/translator/po/az-AZ-pref.po                   |   16 +
 misc/translator/po/ben-i-opac-t-prog-v-3002000.po  |   10 +-
 .../translator/po/ca-VA-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/ca-VA-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/ca-VA-pref.po                   |   16 +
 .../translator/po/da-DK-i-opac-t-prog-v-3002000.po |  673 +-
 .../po/da-DK-i-staff-t-prog-v-3002000.po           | 3432 +-
 misc/translator/po/da-DK-pref.po                   |   54 +-
 .../translator/po/de-DE-i-opac-t-prog-v-3002000.po |  653 +-
 .../po/de-DE-i-staff-t-prog-v-3002000.po           | 4179 +-
 misc/translator/po/de-DE-pref.po                   |   62 +-
 .../translator/po/el-GR-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/el-GR-i-staff-t-prog-v-3002000.po           | 3372 +-
 misc/translator/po/el-GR-pref.po                   |   16 +
 .../translator/po/en-GB-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/en-GB-i-staff-t-prog-v-3002000.po           | 3386 +-
 misc/translator/po/en-GB-pref.po                   |   16 +
 .../translator/po/en-NZ-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/en-NZ-i-staff-t-prog-v-3002000.po           | 3366 +-
 misc/translator/po/en-NZ-pref.po                   |   16 +
 .../translator/po/es-ES-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/es-ES-i-staff-t-prog-v-3002000.po           | 3401 +-
 misc/translator/po/es-ES-pref.po                   |   30 +-
 misc/translator/po/eu-i-opac-t-prog-v-3002000.po   |  132 +-
 misc/translator/po/eu-pref.po                      |   20 +-
 .../translator/po/fi-FI-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/fi-FI-i-staff-t-prog-v-3002000.po           | 3322 +-
 misc/translator/po/fi-FI-pref.po                   |   16 +
 .../translator/po/fr-CA-i-opac-t-prog-v-3002000.po |  137 +-
 .../po/fr-CA-i-staff-t-prog-v-3002000.po           | 3366 +-
 misc/translator/po/fr-CA-pref.po                   |   16 +
 .../translator/po/fr-FR-i-opac-t-prog-v-3002000.po |  156 +-
 .../po/fr-FR-i-staff-t-prog-v-3002000.po           | 9992 ++-
 misc/translator/po/fr-FR-pref.po                   |   16 +
 misc/translator/po/hi-i-opac-t-prog-v-3002000.po   |  139 +-
 misc/translator/po/hi-i-staff-t-prog-v-3002000.po  | 3366 +-
 misc/translator/po/hi-pref.po                      |   16 +
 .../translator/po/hr-HR-i-opac-t-prog-v-3002000.po |  139 +-
 .../po/hr-HR-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/hr-HR-pref.po                   |   16 +
 .../translator/po/hu-HU-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/hu-HU-i-staff-t-prog-v-3002000.po           | 3341 +-
 misc/translator/po/hu-HU-pref.po                   |   16 +
 .../po/hy-Armn-i-opac-t-prog-v-3002000.po          |  135 +-
 .../po/hy-Armn-i-staff-t-prog-v-3002000.po         |27597 +++---
 misc/translator/po/hy-Armn-pref.po                 |   74 +-
 .../translator/po/id-ID-i-opac-t-prog-v-3002000.po |  132 +-
 .../po/id-ID-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/id-ID-pref.po                   |   16 +
 .../translator/po/is-IS-i-opac-t-prog-v-3002000.po |  141 +-
 misc/translator/po/is-IS-pref.po                   |   16 +
 .../translator/po/it-IT-i-opac-t-prog-v-3002000.po |  443 +-
 .../po/it-IT-i-staff-t-prog-v-3002000.po           | 3763 +-
 misc/translator/po/it-IT-pref.po                   |   56 +-
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3002000.po       |  139 +-
 misc/translator/po/ja-Jpan-JP-pref.po              |   16 +
 .../po/lo-Laoo-i-opac-t-prog-v-3002000.po          |  135 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3002000.po         | 3305 +-
 misc/translator/po/lo-Laoo-pref.po                 |   16 +
 .../translator/po/mi-NZ-i-opac-t-prog-v-3002000.po |  139 +-
 misc/translator/po/mi-NZ-pref.po                   |   16 +
 misc/translator/po/mon-i-opac-t-prog-v-3002000.po  |  139 +-
 misc/translator/po/mon-i-staff-t-prog-v-3002000.po | 3365 +-
 misc/translator/po/mon-pref.po                     |   16 +
 .../translator/po/ms-MY-i-opac-t-prog-v-3002000.po |  137 +-
 .../po/ms-MY-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/ms-MY-pref.po                   |   16 +
 .../translator/po/nb-NO-i-opac-t-prog-v-3002000.po |  180 +-
 .../po/nb-NO-i-staff-t-prog-v-3002000.po           | 3856 +-
 misc/translator/po/nb-NO-pref.po                   |   16 +
 .../translator/po/nl-BE-i-opac-t-prog-v-3002000.po | 3601 +-
 .../po/nl-BE-i-staff-t-prog-v-3002000.po           | 3317 +-
 misc/translator/po/nl-BE-pref.po                   |  754 +-
 .../translator/po/nl-NL-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/nl-NL-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/nl-NL-pref.po                   |   16 +
 .../translator/po/nn-NO-i-opac-t-prog-v-3002000.po |  137 +-
 .../po/nn-NO-i-staff-t-prog-v-3002000.po           | 3360 +-
 misc/translator/po/nn-NO-pref.po                   |   16 +
 .../translator/po/pl-PL-i-opac-t-prog-v-3002000.po |  383 +-
 .../po/pl-PL-i-staff-t-prog-v-3002000.po           |14870 ++--
 misc/translator/po/pl-PL-pref.po                   |  220 +-
 .../translator/po/pt-BR-i-opac-t-prog-v-3002000.po | 2289 +-
 .../po/pt-BR-i-staff-t-prog-v-3002000.po           |23580 +++--
 misc/translator/po/pt-BR-pref.po                   | 1582 +-
 .../translator/po/pt-PT-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/pt-PT-i-staff-t-prog-v-3002000.po           | 3386 +-
 misc/translator/po/pt-PT-pref.po                   |   16 +
 .../translator/po/ro-RO-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/ro-RO-i-staff-t-prog-v-3002000.po           | 3334 +-
 misc/translator/po/ro-RO-pref.po                   |   16 +
 .../translator/po/ru-RU-i-opac-t-prog-v-3002000.po | 6815 +-
 .../po/ru-RU-i-staff-t-prog-v-3002000.po           |79040 ++++++++-------
 misc/translator/po/ru-RU-pref.po                   | 3936 +-
 .../translator/po/sd-PK-i-opac-t-prog-v-3002000.po |  132 +-
 .../po/sd-PK-i-staff-t-prog-v-3002000.po           | 3305 +-
 misc/translator/po/sd-PK-pref.po                   |   16 +
 .../translator/po/sv-SE-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/sv-SE-i-staff-t-prog-v-3002000.po           | 3309 +-
 misc/translator/po/sv-SE-pref.po                   |   16 +
 misc/translator/po/tet-i-opac-t-prog-v-3002000.po  |  437 +-
 misc/translator/po/tet-i-staff-t-prog-v-3002000.po | 6261 +-
 misc/translator/po/tet-pref.po                     |   16 +
 .../po/th-THA-i-opac-t-prog-v-3002000.po           |  139 +-
 .../po/th-THA-i-staff-t-prog-v-3002000.po          | 3305 +-
 misc/translator/po/th-THA-pref.po                  |   16 +
 .../translator/po/tr-TR-i-opac-t-prog-v-3002000.po |  141 +-
 .../po/tr-TR-i-staff-t-prog-v-3002000.po           | 3370 +-
 misc/translator/po/tr-TR-pref.po                   |   16 +
 .../translator/po/uk-UA-i-opac-t-prog-v-3002000.po | 6819 +-
 .../po/uk-UA-i-staff-t-prog-v-3002000.po           |108001 ++++++++++----------
 misc/translator/po/uk-UA-pref.po                   | 3921 +-
 .../po/ur-Arab-i-opac-t-prog-v-3002000.po          |  132 +-
 .../po/ur-Arab-i-staff-t-prog-v-3002000.po         | 3305 +-
 misc/translator/po/ur-Arab-pref.po                 |   16 +
 .../po/zh-Hans-CN-i-opac-t-prog-v-3002000.po       |  139 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3002000.po      | 3363 +-
 misc/translator/po/zh-Hans-CN-pref.po              |   16 +
 .../po/zh-Hans-TW-i-opac-t-prog-v-3002000.po       |  141 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3002000.po      |11485 +--
 misc/translator/po/zh-Hans-TW-pref.po              |   16 +
 130 files changed, 219248 insertions(+), 208794 deletions(-)
 create mode 100644 misc/release_notes/release_notes_3_4_6.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov  9 19:55:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 18:55:30 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.05-128-ge7a667b
Message-ID: <E1RODJ4-0005em-71@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  e7a667bb8aa22ff6ce003694e83080f3a4d8968e (commit)
      from  96979f5f586d9debf2481a71166f4fee885f8903 (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 e7a667bb8aa22ff6ce003694e83080f3a4d8968e
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Nov 9 13:54:18 2011 -0500

    Updating Version Number to 3.04.06.000

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

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 Nov  9 19:56:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 09 Nov 2011 18:56:14 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.04.06
	created. v3.04.06
Message-ID: <E1RODJm-0005fy-Ej@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.04.06 has been created
        at  66420b96d0374b809da41ace9de120fa4fd4321a (tag)
   tagging  e7a667bb8aa22ff6ce003694e83080f3a4d8968e (commit)
  replaces  v3.04.05
 tagged by  Chris Nighswonger
        on  Wed Nov 9 13:54:48 2011 -0500

- Log -----------------------------------------------------------------
v3.04.06
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAABAgAGBQJOusyTAAoJEEQBPavVIgJhcA4H/1FJGGtF2DM8icuUxnjPElO+
M8mrI1C+9U0SewQ6HwUH5wnWbq3PZXShNbhsma0kHXabLQ8MycIaQvyiby1SrTCo
x4Y2ZaeJWiWzPmiDIUHPj+9B0Q0Uzr3z+/rdoCN28HFk+7w1vnLijz/di6moRHuM
EULNYEcTmgGBuzDVsSRb8+QWKk1uOsWSUrMiSrMBWV+Q10BjCyazFh4xL9H1jeJQ
Z3rynl9CmhGaL9vaKkwU16/EuR6MYvDvQaTCxBkE9WHkMdxZ14XBp8t27oRB6yIP
07zETrFNW7Y7WnqOjAw5vkXW4fpPV3am9S1apLZY5ClCmrT6oyVNbS5iwxlit3g=
=8A1G
-----END PGP SIGNATURE-----

Alex Arnaud (1):
      Bug 6755 follow up

Chris Cormack (17):
      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
      Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
      Fixing a broken test
      Adding new developer to history
      Updating history and about file
      Bug 6958 : Fix for leading spaces being stripped on translation
      Fixing line endings
      Bug 5459 - Holds not being shifted when merging biblios
      Bug 5630 CAS improvements
      Bug 6885 Follow up to fix superlibarian permission check
      Bug 5780 - Export the URI as part of a RIS export
      Adding another developer to the history
      Updating perl version required to match reality
      Bug 6972 : Followup fixing bad indentation

Chris Nighswonger (6):
      Updating Version Number to 3.04.05.001
      Updating Version Number to 3.04.05.002
      Updating Version Number to 3.04.05.003
      Removing merge conflict markers
      Release Notes for 3.04.06.000
      Updating Version Number to 3.04.06.000

Colin Campbell (2):
      Bug 6667 Correct documentation of function
      Bug 6806 Fix encoding of title in subscription-add

D Ruth Bavousett (2):
      Bug 6900 - line break between available and reference items
      Bug 6867: Date last seen ignored on import

Fr?d?ric Demians (8):
      Bug 6755 Problems with switching languages
      Bug 6649 Allow help screens editing
      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 7026 Web installer does not switch language
      3.4.6 Translation Update

Fr?d?rick Capovilla (2):
      Bug 6977 : Adds support for repeatable subfields when importing authorities.
      Bug 6854: Correct a double password encryption problem in import_borrowers.pl

Galen Charlton (1):
      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

Ian Walls (18):
      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 6959: can't import record via Z39.50 from MARC edit page
      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 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 7057: CheckReserves uses GetMemberDetails unnecessarily
      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
      Bug 5995 Followup: checkpw was returning inconsistent values

Janusz Kaczmarek (1):
      Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)

Jared Camins-Esakov (1):
      Bug 7007: 490 series statements should appear when not traced

Jonathan Druart (2):
      Bug 6076: acqui pdf error when marcxml wrong
      Bug 6048: printoverdues.sh bash odities

Joy Nelson (1):
      Bug 6773: circ/ysearch.pl is unlimited

Juan Romay Sieira (1):
      Bug 6925 : The way to show the plural of the word "Item" is not compatible with multilanguage

Katrin Fischer (3):
      Bug 3704: SIP Checkin of not checked out item returns error without reason
      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 (4):
      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 (1):
      Bug 6460: alternative fix, updating template and script instead of C4::Log

Magnus Enger (2):
      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 (10):
      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 (1):
      Bug 5995 : MT2892: Fix security issue in CAS intranet login

Maxime Pelletier (2):
      Bug 6679 : fix 3 perl::critic warnings
      Bug 6972: Hardcoded template paths to en in showmarc

Meenakshi.R (1):
      Bug:6781--Log membership renewal

Nicole C. Engard (1):
      Bug 7044 OPAC Branch Selector Fix

Owen Leonard (12):
      Fix for Bug 6766 - Template variable scope errors in holds template
      Fix for Bug 6842 - Branch transfer limits broken
      Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
      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 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

Paul Poulain (11):
      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

Robin Sheat (7):
      Bug 6360 - add some more sounds to some happenings on returns
      Bug 6824 - correctly check basket viewing permissions
      Bug 6205 - if an include doesn't exist, fall back to en
      Bug 6938 - replace two subscription fields that were incorrectly removed
      Bug 6526 - make the reserves code use the borrowernumber
      Bug 6929 - ensure that koha-stop-zebra will try to stop everything
      Bug 6905: [3.4.x] change which page clicking users in circ history takes you to

Srdjan Jankovic (6):
      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_6974: bugfix: do not create empty record before building input for new biblio
      bug_6253: Unified member Search()
      bug_5533: Improved marking items as lost
      bug_6770: removed doubled override increment when using AllowHoldPolicyOverride

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 14:50:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 13:50:48 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.00-32-g604216a
Message-ID: <E1RQft2-00036Z-OA@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.6.x has been updated
       via  604216acf6f173d7576a47395aceeebc87b0d493 (commit)
       via  05f1a92c21fbce96dedc7ba3706d738561f426c0 (commit)
       via  9aba4077c217093436f732c676c066ab9dc8b16b (commit)
       via  9e5da38f7cc5958d825d730f1db602c5f34b8220 (commit)
       via  0f2500bd59100a3f6322f16b3e1e6ec4d8a49860 (commit)
       via  093d5bb24de6d9a8bd47da9f5c42ccbcdac4fe0d (commit)
       via  b207487bbb4d5bdc9d70c78101a8558677268b85 (commit)
       via  01c462ff28c6f3ae27118dd3074c171ddbed6dc4 (commit)
       via  598c008fa3155645059800d01d72458733ecd5fe (commit)
       via  edcbd0cde07d496ceb7b01e60ee7f21995b37274 (commit)
       via  a6b7a1432ab6339d0589f8104da2d7ebb21cea85 (commit)
       via  73139544c87b6dc16dba7a0e15659c8a6c4eeb2f (commit)
       via  916e103dfc56b28b7111f8099e96106a95e8e487 (commit)
       via  fe0afd350654000eec0a67b82893c2e6cc4d99df (commit)
       via  99147d26033d2fbd4f7e265f6f1074d7c928ce3a (commit)
       via  cf9fca42c38f165c0ee43637ce34b971bd59414c (commit)
       via  5c2398c005548ebe3dbbc0b1f54863b9ff30e8b4 (commit)
       via  7622bedd306ea4424ada3614c79e94fa8b827666 (commit)
       via  224d0ca8190f86c6ceb68a9d263124cc9fcdce91 (commit)
       via  ca21067cb4adace7e494a30e2f5ea1b058ddb2e5 (commit)
       via  9452c84a9a3df786233dfad3ff7df912d3bfdf82 (commit)
       via  0ec00cd1cbcad11a7860e031bfd21bc90794373d (commit)
       via  da2dfd0dce1975c4b5451113af607ebce7d1c8e8 (commit)
       via  d6e27f5cee7c016ee09662d441d922b89a1c6174 (commit)
       via  12070db7d8c4e2878665345f2139ae9793964fc7 (commit)
       via  2f36d9b45f26a7032c4a43a8324545123b4542fb (commit)
       via  f9af3fc79bbbfb2cd6fa71052ea1de44f1da456f (commit)
       via  6eb4a7f5831ca63ebee8b9756b8db8e7137051af (commit)
       via  75586d7ea73626705724623973c1e1aa222a6e6f (commit)
       via  b8c840734f24a88a41267d7ff336bcbe20cb570a (commit)
       via  3024ac0b41794016362c552844260b232334dd1e (commit)
       via  6a0be282843a89dd3e3bc44c768f9b22e64e3bcf (commit)
      from  52c666edce4261a1acafaa34b2c8a2431589ac0c (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 604216acf6f173d7576a47395aceeebc87b0d493
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Nov 4 06:26:01 2011 -0400

    Bug 5945: email not searchable in patron search
    
    Adds 'email' to valid search parameters in members/member.pl
    
    To test:
    1. give a patron a unique email address in your test database
    2. search on the full email; should work
    3. search on the part of the email before the domain; should work
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit c3abbedebedd34948b664a4d2a6b34dc4863802d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 05f1a92c21fbce96dedc7ba3706d738561f426c0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Nov 3 00:44:36 2011 +0100

    Bug 7138: Can't print basket group order pdf
    
    PDF print of basket groups is broken.
    
    To test:
    
    1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
    2) Create a basket with orders
    3) Close the basket and create a basket group checking the checkbox
    4) Print the basket group as PDF
    
    Before patch the file is broken and when opened in an editor contains an error message.
    After the patch the PDF should be generated correctly again.
    
    Thx to Chris for helping me to fix the problem.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9aba4077c217093436f732c676c066ab9dc8b16b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 31 20:57:19 2011 +1300

    Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    tested with diacritics, no changes before and after the patch
    (cherry picked from commit ee0627f20bee5df234ab284d1fdacebb857de57f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9e5da38f7cc5958d825d730f1db602c5f34b8220
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:27:48 2011 +1300

    Bug 6679 : Tidying changed parts of file
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 3b0474950c791bbf0367f6c819203180205f7aa8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0f2500bd59100a3f6322f16b3e1e6ec4d8a49860
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:24:05 2011 +1300

    Bug 6679 : Don't declare variables in conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 21e4d79be8b0a7204dd592528e20f5b8e29553ee)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 093d5bb24de6d9a8bd47da9f5c42ccbcdac4fe0d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:19:36 2011 +1300

    Bug 6679 : Not using strict .. bad script, no cookie for you!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit e8ea58270dc08aac8c1eaccc59e17d96daf56860)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b207487bbb4d5bdc9d70c78101a8558677268b85
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:13:20 2011 +1300

    Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 607b5449bd5cb79dd8964e46bb970c3975497969)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 01c462ff28c6f3ae27118dd3074c171ddbed6dc4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:00:01 2011 +1300

    Bug 6679 : Declare variables outside of conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6bb73a04c4c67e5b14eb209ec56ae6585547c593)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 598c008fa3155645059800d01d72458733ecd5fe
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 16:13:15 2011 -0400

    Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber
    
    aqbasket.authorisedby is not foreign key constrainted to borrowers.borrowernumber,
    so if it's anything other than that, vendor search breaks by using an undefined value
    (GetMember() on an invalid borrowernumber) as a HASH ref.
    
    This patch sets the branchcode (the desired value from GetMember) to a blank value, then only
    changes it if GetMember is defined.  In the case where the authorisedby librarian has been deleted,
    or the value is otherwise invalid, and AcqViewBaskets is set to 'branch', the basket will not appear
    except to superlibrarians
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Invalid borrowernumber in aqbasket.authorisedby no longer breaks search.
    (cherry picked from commit 58bdfdb08883eb52777321f883491eaff1493857)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit edcbd0cde07d496ceb7b01e60ee7f21995b37274
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:58:41 2011 +0200

    Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
    
    Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
    As we don't support anything outside from mysql, returning directly mysql directly
    
    If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway
    
    Testing note:
    Drops execution time of the line from 300ms to 20 microseconds (in my testing).
    (cherry picked from commit 0f8db0c53866afaf5171869359c558d1e9f4325e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a6b7a1432ab6339d0589f8104da2d7ebb21cea85
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Sun Nov 6 14:14:40 2011 +0530

    Bug 7185: Fix updatedatabase message for 3.6.0 release
    
    Signed-off-by: Fran?ois Charbonnier <francois.charbonnier at biblibre.com>
    (cherry picked from commit e228f233e4638fdbeb77495fafb8453045d43302)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 73139544c87b6dc16dba7a0e15659c8a6c4eeb2f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 09:36:52 2011 +0100

    Bug 7184 raise mySQL error if debug is set
    
    Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
    With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error
    
    Step to test:
    === BEFORE PATCH ===
    go anywhere, and change a mySQL statement to make it invalid.
    Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results
    
    === AFTER PATCH ===
    Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
    SetEnv DEBUG 1
    restart/reload Apache
    Launch the same page, you'll get a Perl statement saying something like:
    
    DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
    (cherry picked from commit 016e66c6f25fbe3b648bcb8dad8d59f80d11b992)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 916e103dfc56b28b7111f8099e96106a95e8e487
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Nov 1 14:01:17 2011 -0500

    Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
    
    To test:
    verify that the loggedin id is added when user is logged in
    verify that the notloggedin id is evident when no user is logged in.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Bug 7128 : Follow up, adding the id to the case when a user is not logged in
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 4ccb8649f88abaf9012f1bbec06fc840046cb7ff)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fe0afd350654000eec0a67b82893c2e6cc4d99df
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 20:59:57 2011 +0200

    Bug 6994: Wrong 'no budget defined' alert
    
    When ordering from an existing record the 'no budgets and funds defined' error
    message was shown below the result list.
    
    To test:
    A) No budgets defined for this user and library
    Basket summary page shows a warning instead of the link for creation
    of orders.
    
    B) Budgets and funds are properly defined for this user and library
    Basket summary page shows links for order creation.
    Before patch: A search for an existing record had the alert at the bottom
    of the search result list.
    After patch: The links for creation of orders are shown instead.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified A and B.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 488f4be86537211214ede7e0e703128c0cc4c92f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 99147d26033d2fbd4f7e265f6f1074d7c928ce3a
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Wed Oct 5 15:12:04 2011 -0400

    Notify the user on his account page when his account is almost expired
    
    New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
    notification appears in the user's account page if his subscription is almost
    expired.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6978
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    works perfectly with date formatted DD/MM/YYYY as well
    (cherry picked from commit e676e117fccfaa8208742c17a08cb92056286f95)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cf9fca42c38f165c0ee43637ce34b971bd59414c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 20 09:22:46 2011 -0400

    Bug 6471: add tablesorter to Holds Queue
    
    This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0ea8ff7c4c81c183ba8da64d7939b041c7de8301)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5c2398c005548ebe3dbbc0b1f54863b9ff30e8b4
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Oct 25 10:16:02 2011 -0400

    Fix for Bug 7085 - Problems with searching for orders in acquisitions
    
    Changing "if ( defined $input )" to "if ( $input )" in the section
    of the script which builds the order search query seems to give
    successful searches where they didn't exist before. Searches from
    the advanced order search screen work with title, author, vendor,
    basket number, date, etc.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Searches for date ranges, title and author keywords give
    me the correct results now.
    (cherry picked from commit 0c0ddf92113b4a5df6833f75ba5b7ad7527c5f48)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7622bedd306ea4424ada3614c79e94fa8b827666
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 31 01:06:17 2011 +0100

    Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
    
    To test:
    1) Add some suggestions
    2) Go to suggestions in staff
    3) Choose from filters 'suggested by' or 'managed by'
    4) Compare names shown on tabs with names in list of suggestions
    
    Before patch: tab name has the wrong order, while list name is correct.
    After patch: all names should be consistent and correct.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 224d0ca8190f86c6ceb68a9d263124cc9fcdce91
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Nov 3 13:41:24 2011 +0100

    7146 (Update timestamps when deleting a biblio)
    
    Currently, when you delete an item, the timestamp column in deleteditems is
    updated with current time. (This comes from an [unintentional] additional
    update statement in DelItem.) It makes deletion time visible.
    In the past, the marcxml was updated too at that moment, resulting in an
    updated timestamp in biblioitems too. The timestamp in biblio was not touched.
    
    If you delete a biblio however, the timestamps in deletedbiblio and
    deletedbiblioitems do not reflect time of deletion. They still show the time of
    last update before the record was deleted. This last update can be extracted
    from MARC field 005 too.
    
    This behavior is not consistent nor logical. I would suggest to add a statement
    in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
    makes the time of deletion visible in the record too. The time of deletion of a
    biblio can be very useful for e.g. synchronizing purposes.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ca21067cb4adace7e494a30e2f5ea1b058ddb2e5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Nov 4 14:56:50 2011 -0400

    Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
    
    Fixing two stray instances of "supplier."
    (cherry picked from commit 0038b0df15a838468bf7c23a389c260075dfd1c4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9452c84a9a3df786233dfad3ff7df912d3bfdf82
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 20:17:17 2011 -0400

    Bug 7061: unnecessary global variables declared in C4::SQLHelper
    
    Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
    all instances of $table are locally scoped to the subroutines, and $hash is never used.
    
    This may help with persistance; if not, it's at least a bit of trivial cleanup.
    
    To test:
    
    1.  Search for a patron
    2.  Create a Contract in Acquisitions
    3.  Modify that Contract
    4.  Delete that Contract
    
    All instances should return error free.  This checks the subroutines of SQLHelper
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 36d8e5df96d17df3d19a4693fff2ba52504fae51)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0ec00cd1cbcad11a7860e031bfd21bc90794373d
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Oct 8 15:30:59 2011 +0200

    Bug 6989 Patron categories not properly displayed if not pure ASCII
    
    C4::Category module returns badly encoded patron categories when they are
    containing non pure-ASCII characters.
    
    To reproduce this bug:
    
      - Go in Administration > Patron Categories
      - Add a new category. Give it this code for example:
        Caf?
      - Click on Patrons link on top menu
      - Click on New button
    
        => You get 'Caf?' displayed without accent
    
    Signed-off-by: Piotr Wejman <ropuch at bagno.be>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit da2dfd0dce1975c4b5451113af607ebce7d1c8e8
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 15 14:05:04 2010 +0100

    Bug 5885 : UNIMARC XSLT changes
    
    dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    I can't test this works ok for UNIMARC, but it does not cause any
    problems with the translation scripts or MARC21 so signing off
    (cherry picked from commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d6e27f5cee7c016ee09662d441d922b89a1c6174
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 11:43:17 2011 -0400

    Bug 7076: Lists render OPAC XSLT on staff side
    
    Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
    OPACResultsXSLT if the $type is 'opac'.  Since parsing the XML is such an expensive
    thing, and the resulting XSLTBloc is not used on the staff side, this will increase
    performance for Lists in the intranet
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit a0a9368beccd1748e720966f25869259a30e68f2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 12070db7d8c4e2878665345f2139ae9793964fc7
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 17 16:01:29 2011 -0400

    Follow-up patch : use the subfield associated with items.barcode
    
    Instead of using the 'p' subfield directly, use the subfield letter
    associated with the items.barcode column.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Test cases tested:
    - 1 item, barcode empty
    - 2 items, barcodes both empty
    - 1 item, existing barcode
    - 1 item, new barcode
    - 2 items, one barcode empty, one existing
    
    All test cases worked nicely and gave correct error messages.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 61e1eeee84083f835a85d43128f4b6cbeef636dd)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2f36d9b45f26a7032c4a43a8324545123b4542fb
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 3 15:00:05 2011 -0400

    Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
    
    If the AcqCreateItem preference is set to "ordering" and the barcode for
    the new item is already in use, no error is returned, but an invalid
    itemnumber is saved in the aqorders_items table and the item is never
    created.
    
    This patch adds a duplicate barcode verification in neworderempty.pl
    _koha_add_item is also modified so it won't return an invalid ID when
    an item can't be added.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan on second patch.
    (cherry picked from commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f9af3fc79bbbfb2cd6fa71052ea1de44f1da456f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 5 16:39:08 2011 +1300

    Bug 6895 : First attempt at fixing the diacritics bug
    
    This is a fairly hacky solution, a counter patch would be more than
    welcome
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Updated, translated and installed German po files after applying this patch.
    No problems found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6eb4a7f5831ca63ebee8b9756b8db8e7137051af
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Oct 19 15:28:16 2011 -0400

    Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=7069
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch changes '' to "" to make it work for strings which contain '.
    Patch does NOT add new strings to the po files.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7ff9d9d03cc0efd07a8667b093927af4a9c3fb29)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 75586d7ea73626705724623973c1e1aa222a6e6f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 3 08:59:18 2011 -0400

    Fix for Bug 6955, Toolbar on reading history broken
    
    Table sorter script causes error if there is no <tbody> to sort.
    JS errors cause the YUI toolbar js to abort, causing the problem
    observed. When there are no results the whole table should be
    omitted and a message displayed in its place.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To test:
    - check toolbar on top of patron reading history with no entries
    - check toolbar on top of patron reading history after a few checkouts
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 54226b60f3e31ba52d6be88eeebcaf534ada296f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b8c840734f24a88a41267d7ff336bcbe20cb570a
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Sep 21 14:15:39 2011 -0400

    Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
    
    http://bugs.koha-community.org/show_bug.cgi?id=6414
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Signed off with a note: this doesn't fix everything mentioned in the bug.
    It also might clash with bug 4831 and should be tested with that patch.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3024ac0b41794016362c552844260b232334dd1e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 4 19:46:45 2011 +1300

    Sorry pushed this by mistake when trying to fix Pauls permissions
    
    Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
    
    This reverts commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3.
    (cherry picked from commit 7a82e508f020aed3691222e08695a0f7cfd86b48)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6a0be282843a89dd3e3bc44c768f9b22e64e3bcf
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 28 14:08:00 2011 -0400

    Fix for Bug 5974 - Bogus auth check for "StaffMember" role
    
    Also removing some YAHOO.widget.Button declarations which
    are redundant.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Acquisition.pm                                  |   12 +-
 C4/Biblio.pm                                       |   18 ++-
 C4/Category.pm                                     |   13 +-
 C4/Context.pm                                      |    9 +-
 C4/Items.pm                                        |    8 +-
 C4/SQLHelper.pm                                    |    3 -
 C4/VirtualShelves/Page.pm                          |    2 +-
 acqui/basketgroup.pl                               |    2 +-
 acqui/booksellers.pl                               |    6 +-
 .../check_duplicate_barcode_ajax.pl                |   44 ++++---
 acqui/neworderbiblio.pl                            |   18 +++-
 acqui/neworderempty.pl                             |    5 +
 admin/aqplan.pl                                    |    2 +-
 cataloguing/value_builder/dateaccessioned.pl       |    4 +-
 cataloguing/value_builder/macles.pl                |  123 ++++++++++++--------
 cataloguing/value_builder/unimarc_field_4XX.pl     |   15 ++-
 installer/data/mysql/updatedatabase.pl             |    2 +-
 .../en/includes/acquisitions-add-to-basket.inc     |    2 +-
 .../prog/en/modules/acqui/neworderempty.tt         |   52 ++++++++-
 .../prog/en/modules/acqui/supplier.tt              |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    2 +-
 .../en/modules/cataloguing/value_builder/macles.tt |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |   10 ++
 .../prog/en/modules/installer/auth.tt              |    2 +-
 .../prog/en/modules/members/readingrec.tt          |    5 +-
 .../prog/en/modules/serials/claims.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   10 +-
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    8 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |   22 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    6 +
 labels/label-create-pdf.pl                         |   10 +-
 labels/label-create-xml.pl                         |   27 ++++-
 labels/label-edit-batch.pl                         |    9 +-
 labels/label-print.pl                              |   15 ++-
 members/member.pl                                  |    2 +-
 misc/translator/xgettext.pl                        |    2 +-
 opac/opac-user.pl                                  |   21 ++++
 suggestion/suggestion.pl                           |    2 +-
 39 files changed, 341 insertions(+), 160 deletions(-)
 copy tools/upload-file-progress.pl => acqui/check_duplicate_barcode_ajax.pl (51%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 15:24:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 14:24:54 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.06-29-g319aaca
Message-ID: <E1RQgQ2-0003K9-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, 3.4.x has been updated
       via  319aaca81fd0728dc6ff4730d968ba2fcc8e911c (commit)
       via  4db9c13ab5fe3d5f692c2b7cbc5d55c8c2de39a1 (commit)
       via  2848f7f20b375d35f54718a323158da11459567e (commit)
       via  b1dc79ffa33c35272fcbc2d6710eb740d230db68 (commit)
       via  43d8adf7bc59d73dc00236d91804e0dce61508a3 (commit)
       via  7d4db83a7a0c0718dc812313dbcfeb106dcd2ca6 (commit)
       via  d5b97aa1cbee56878c361542059af96b307129b5 (commit)
       via  ea6f7520200129d7f912d190f06747b59a4c5e5c (commit)
       via  8c1f853ef5e93b70834b557c87d03b7ca5baa98f (commit)
       via  71f9b11addb1dc11e25a9dbed01d0f3ff45fd967 (commit)
       via  3032fd1d9e179d05377027ab84279ba3faf8f5f5 (commit)
       via  06fc7eaa807cce3adbe459a6c90c01a3e610ddad (commit)
       via  659aa24e9bb04b9149e2846b5b5f40f30f1aba2c (commit)
       via  58abaaf00048b173d62cdcc8783bf867a84fafcf (commit)
       via  87a32efcc3aa972c232c25ffbc030129ececd6b9 (commit)
       via  7d8ad8f9f18f0db209321d4349c27820ac553024 (commit)
       via  de3e6798658abc4226daed21116c945d2b940e53 (commit)
       via  38d355298317fb9056f33e07b36309a6e19a62fa (commit)
       via  15a04cacd503bbf602b492d91ef01b0926367184 (commit)
       via  f4d8032d4785834a8b635ef1e2ada0bb993c3a72 (commit)
       via  5fee6f518aab4160ad6edd834a862743d67077ee (commit)
       via  fd5f34d2acfe3725acfcbddcd034ec51cc907353 (commit)
       via  0a06936b2a5c0624ddfa9208774101c9bf00006b (commit)
       via  6b78db76b1fc2715f0993a285673942d0c00009b (commit)
       via  5a90f3b4f7bf9831f2bf0d22ba7a0402d1a8d4b6 (commit)
       via  5e84b9d3abba4a3d0c19af281a2b1734b3248730 (commit)
       via  d866a10f091f465d150744062552f7f5062e5336 (commit)
       via  19c436d1f606077ea2d3b425ed041296d1b953fb (commit)
       via  32168100f4ccc9a5f5fec70e0d522c1174a2fbcd (commit)
      from  e7a667bb8aa22ff6ce003694e83080f3a4d8968e (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 319aaca81fd0728dc6ff4730d968ba2fcc8e911c
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Nov 4 06:26:01 2011 -0400

    Bug 5945: email not searchable in patron search
    
    Adds 'email' to valid search parameters in members/member.pl
    
    To test:
    1. give a patron a unique email address in your test database
    2. search on the full email; should work
    3. search on the part of the email before the domain; should work
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    (cherry picked from commit c3abbedebedd34948b664a4d2a6b34dc4863802d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4db9c13ab5fe3d5f692c2b7cbc5d55c8c2de39a1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Thu Nov 3 00:44:36 2011 +0100

    Bug 7138: Can't print basket group order pdf
    
    PDF print of basket groups is broken.
    
    To test:
    
    1) Make sure OrderPdfFormat is set to pdfformat::layout2pages or pdfformat::layout3pages
    2) Create a basket with orders
    3) Close the basket and create a basket group checking the checkbox
    4) Print the basket group as PDF
    
    Before patch the file is broken and when opened in an editor contains an error message.
    After the patch the PDF should be generated correctly again.
    
    Thx to Chris for helping me to fix the problem.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7a3dc5102e82bbb4c0c8487a0f128c20d4fe8248)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2848f7f20b375d35f54718a323158da11459567e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Oct 31 20:57:19 2011 +1300

    Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    tested with diacritics, no changes before and after the patch
    (cherry picked from commit ee0627f20bee5df234ab284d1fdacebb857de57f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b1dc79ffa33c35272fcbc2d6710eb740d230db68
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:27:48 2011 +1300

    Bug 6679 : Tidying changed parts of file
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 3b0474950c791bbf0367f6c819203180205f7aa8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 43d8adf7bc59d73dc00236d91804e0dce61508a3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:24:05 2011 +1300

    Bug 6679 : Don't declare variables in conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 21e4d79be8b0a7204dd592528e20f5b8e29553ee)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7d4db83a7a0c0718dc812313dbcfeb106dcd2ca6
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:19:36 2011 +1300

    Bug 6679 : Not using strict .. bad script, no cookie for you!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit e8ea58270dc08aac8c1eaccc59e17d96daf56860)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d5b97aa1cbee56878c361542059af96b307129b5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:13:20 2011 +1300

    Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 607b5449bd5cb79dd8964e46bb970c3975497969)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ea6f7520200129d7f912d190f06747b59a4c5e5c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Nov 2 16:00:01 2011 +1300

    Bug 6679 : Declare variables outside of conditionals
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6bb73a04c4c67e5b14eb209ec56ae6585547c593)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8c1f853ef5e93b70834b557c87d03b7ca5baa98f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sat Sep 17 00:58:41 2011 +0200

    Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
    
    Checking NYTProf in C4::Context, it appears that the /i flag is highly time-consumming
    As we don't support anything outside from mysql, returning directly mysql directly
    
    If in a future version PostgresSQL works, then we will have to update this sub. But if an ORM is introduced, this code will be removed completly anyway
    
    Testing note:
    Drops execution time of the line from 300ms to 20 microseconds (in my testing).
    (cherry picked from commit 0f8db0c53866afaf5171869359c558d1e9f4325e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 71f9b11addb1dc11e25a9dbed01d0f3ff45fd967
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Sun Nov 6 09:36:52 2011 +0100

    Bug 7184 raise mySQL error if debug is set
    
    Before this patch, if a mySQL occured in Koha (any error), then the user was seeing nothing.
    With this patch, if DEBUG is set in Koha VirtualHost, any mySQL error will make Koha die and display the SQL error
    
    Step to test:
    === BEFORE PATCH ===
    go anywhere, and change a mySQL statement to make it invalid.
    Launch a page using the SQL you've made wrong, you'll see nothing, except you won't see the expected results
    
    === AFTER PATCH ===
    Modify koha-httpd.conf, and add the following line, in the virtualhost (if it does not already exist)
    SetEnv DEBUG 1
    restart/reload Apache
    Launch the same page, you'll get a Perl statement saying something like:
    
    DBD::mysql::st execute failed: <<blablabla SQL error>> at <<where the error was raised line <<error line>>
    (cherry picked from commit 016e66c6f25fbe3b648bcb8dad8d59f80d11b992)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3032fd1d9e179d05377027ab84279ba3faf8f5f5
Author: Liz Rea <lrea at nekls.org>
Date:   Tue Nov 1 14:01:17 2011 -0500

    Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
    
    To test:
    verify that the loggedin id is added when user is logged in
    verify that the notloggedin id is evident when no user is logged in.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Bug 7128 : Follow up, adding the id to the case when a user is not logged in
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 4ccb8649f88abaf9012f1bbec06fc840046cb7ff)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 06fc7eaa807cce3adbe459a6c90c01a3e610ddad
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 20:59:57 2011 +0200

    Bug 6994: Wrong 'no budget defined' alert
    
    When ordering from an existing record the 'no budgets and funds defined' error
    message was shown below the result list.
    
    To test:
    A) No budgets defined for this user and library
    Basket summary page shows a warning instead of the link for creation
    of orders.
    
    B) Budgets and funds are properly defined for this user and library
    Basket summary page shows links for order creation.
    Before patch: A search for an existing record had the alert at the bottom
    of the search result list.
    After patch: The links for creation of orders are shown instead.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified A and B.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 488f4be86537211214ede7e0e703128c0cc4c92f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 659aa24e9bb04b9149e2846b5b5f40f30f1aba2c
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Wed Oct 5 15:12:04 2011 -0400

    Notify the user on his account page when his account is almost expired
    
    New feature : If the "NotifyBorrowerDeparture" system preference is defined, a
    notification appears in the user's account page if his subscription is almost
    expired.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6978
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    works perfectly with date formatted DD/MM/YYYY as well
    (cherry picked from commit e676e117fccfaa8208742c17a08cb92056286f95)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 58abaaf00048b173d62cdcc8783bf867a84fafcf
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Sep 20 09:22:46 2011 -0400

    Bug 6471: add tablesorter to Holds Queue
    
    This patch adds the table sorter to Holds Queue.  Sponsored by Farmington Public Library.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0ea8ff7c4c81c183ba8da64d7939b041c7de8301)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 87a32efcc3aa972c232c25ffbc030129ececd6b9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 31 01:06:17 2011 +0100

    Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
    
    To test:
    1) Add some suggestions
    2) Go to suggestions in staff
    3) Choose from filters 'suggested by' or 'managed by'
    4) Compare names shown on tabs with names in list of suggestions
    
    Before patch: tab name has the wrong order, while list name is correct.
    After patch: all names should be consistent and correct.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit e660cef0e2f0ab4a64f8f1b4b0b4ad612255c03b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7d8ad8f9f18f0db209321d4349c27820ac553024
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Nov 3 13:41:24 2011 +0100

    7146 (Update timestamps when deleting a biblio)
    
    Currently, when you delete an item, the timestamp column in deleteditems is
    updated with current time. (This comes from an [unintentional] additional
    update statement in DelItem.) It makes deletion time visible.
    In the past, the marcxml was updated too at that moment, resulting in an
    updated timestamp in biblioitems too. The timestamp in biblio was not touched.
    
    If you delete a biblio however, the timestamps in deletedbiblio and
    deletedbiblioitems do not reflect time of deletion. They still show the time of
    last update before the record was deleted. This last update can be extracted
    from MARC field 005 too.
    
    This behavior is not consistent nor logical. I would suggest to add a statement
    in DelBiblio to force updating the timestamp in deletedbiblio(items) too. It
    makes the time of deletion visible in the record too. The time of deletion of a
    biblio can be very useful for e.g. synchronizing purposes.
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7ee0565f5ce75fac16de2dc06c170bc06a171e56)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit de3e6798658abc4226daed21116c945d2b940e53
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Nov 4 14:56:50 2011 -0400

    Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
    
    Fixing two stray instances of "supplier."
    (cherry picked from commit 0038b0df15a838468bf7c23a389c260075dfd1c4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 38d355298317fb9056f33e07b36309a6e19a62fa
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Tue Oct 18 20:17:17 2011 -0400

    Bug 7061: unnecessary global variables declared in C4::SQLHelper
    
    Removes $tablename and $hash from global scope of C4/SQLHelper.pm.  They are never used;
    all instances of $table are locally scoped to the subroutines, and $hash is never used.
    
    This may help with persistance; if not, it's at least a bit of trivial cleanup.
    
    To test:
    
    1.  Search for a patron
    2.  Create a Contract in Acquisitions
    3.  Modify that Contract
    4.  Delete that Contract
    
    All instances should return error free.  This checks the subroutines of SQLHelper
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 36d8e5df96d17df3d19a4693fff2ba52504fae51)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 15a04cacd503bbf602b492d91ef01b0926367184
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Oct 8 15:30:59 2011 +0200

    Bug 6989 Patron categories not properly displayed if not pure ASCII
    
    C4::Category module returns badly encoded patron categories when they are
    containing non pure-ASCII characters.
    
    To reproduce this bug:
    
      - Go in Administration > Patron Categories
      - Add a new category. Give it this code for example:
        Caf?
      - Click on Patrons link on top menu
      - Click on New button
    
        => You get 'Caf?' displayed without accent
    
    Signed-off-by: Piotr Wejman <ropuch at bagno.be>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit d998166ea30e9d798c97d457afe39c748eed38ae)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f4d8032d4785834a8b635ef1e2ada0bb993c3a72
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Dec 15 14:05:04 2010 +0100

    Bug 5885 : UNIMARC XSLT changes
    
    dealing with some BNF/SUDOC invalid utf-8 (in title, the removed fields are used to mark non-sorted words)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    I can't test this works ok for UNIMARC, but it does not cause any
    problems with the translation scripts or MARC21 so signing off
    (cherry picked from commit cc6c1acb38b8797f71f37ebfd7b26ebcac6806ef)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5fee6f518aab4160ad6edd834a862743d67077ee
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Fri Oct 21 11:43:17 2011 -0400

    Bug 7076: Lists render OPAC XSLT on staff side
    
    Adds a small check in C4::VirtualShelves::Page::shelfpage to only render
    OPACResultsXSLT if the $type is 'opac'.  Since parsing the XML is such an expensive
    thing, and the resulting XSLTBloc is not used on the staff side, this will increase
    performance for Lists in the intranet
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit a0a9368beccd1748e720966f25869259a30e68f2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fd5f34d2acfe3725acfcbddcd034ec51cc907353
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 17 16:01:29 2011 -0400

    Follow-up patch : use the subfield associated with items.barcode
    
    Instead of using the 'p' subfield directly, use the subfield letter
    associated with the items.barcode column.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Test cases tested:
    - 1 item, barcode empty
    - 2 items, barcodes both empty
    - 1 item, existing barcode
    - 1 item, new barcode
    - 2 items, one barcode empty, one existing
    
    All test cases worked nicely and gave correct error messages.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 61e1eeee84083f835a85d43128f4b6cbeef636dd)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0a06936b2a5c0624ddfa9208774101c9bf00006b
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Mon Oct 3 15:00:05 2011 -0400

    Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
    
    If the AcqCreateItem preference is set to "ordering" and the barcode for
    the new item is already in use, no error is returned, but an invalid
    itemnumber is saved in the aqorders_items table and the item is never
    created.
    
    This patch adds a duplicate barcode verification in neworderempty.pl
    _koha_add_item is also modified so it won't return an invalid ID when
    an item can't be added.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6963
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan on second patch.
    (cherry picked from commit 327be442bd6e63e5ff8c0a5e2461ae836e8deffb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6b78db76b1fc2715f0993a285673942d0c00009b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Oct 5 16:39:08 2011 +1300

    Bug 6895 : First attempt at fixing the diacritics bug
    
    This is a fairly hacky solution, a counter patch would be more than
    welcome
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Updated, translated and installed German po files after applying this patch.
    No problems found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5a90f3b4f7bf9831f2bf0d22ba7a0402d1a8d4b6
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Oct 19 15:28:16 2011 -0400

    Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=7069
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch changes '' to "" to make it work for strings which contain '.
    Patch does NOT add new strings to the po files.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7ff9d9d03cc0efd07a8667b093927af4a9c3fb29)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5e84b9d3abba4a3d0c19af281a2b1734b3248730
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Oct 3 08:59:18 2011 -0400

    Fix for Bug 6955, Toolbar on reading history broken
    
    Table sorter script causes error if there is no <tbody> to sort.
    JS errors cause the YUI toolbar js to abort, causing the problem
    observed. When there are no results the whole table should be
    omitted and a message displayed in its place.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    To test:
    - check toolbar on top of patron reading history with no entries
    - check toolbar on top of patron reading history after a few checkouts
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 54226b60f3e31ba52d6be88eeebcaf534ada296f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d866a10f091f465d150744062552f7f5062e5336
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date:   Wed Sep 21 14:15:39 2011 -0400

    Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
    
    http://bugs.koha-community.org/show_bug.cgi?id=6414
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Signed off with a note: this doesn't fix everything mentioned in the bug.
    It also might clash with bug 4831 and should be tested with that patch.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0faf91c591cf8bd02f5e70cc14caeb5257f4d1c5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 19c436d1f606077ea2d3b425ed041296d1b953fb
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 4 19:46:45 2011 +1300

    Sorry pushed this by mistake when trying to fix Pauls permissions
    
    Revert "Fix for Bug 5974 - Bogus auth check for "StaffMember" role"
    
    This reverts commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3.
    (cherry picked from commit 7a82e508f020aed3691222e08695a0f7cfd86b48)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 32168100f4ccc9a5f5fec70e0d522c1174a2fbcd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 28 14:08:00 2011 -0400

    Fix for Bug 5974 - Bogus auth check for "StaffMember" role
    
    Also removing some YAHOO.widget.Button declarations which
    are redundant.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a867bfcff7201a7fa3b56bee4dd484a49ece35e3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |   18 ++-
 C4/Category.pm                                     |   13 +-
 C4/Context.pm                                      |    9 +-
 C4/Items.pm                                        |    8 +-
 C4/SQLHelper.pm                                    |    3 -
 C4/VirtualShelves/Page.pm                          |    2 +-
 acqui/basketgroup.pl                               |    2 +-
 .../check_duplicate_barcode_ajax.pl                |   44 ++++---
 acqui/neworderbiblio.pl                            |   18 +++-
 acqui/neworderempty.pl                             |    5 +
 admin/aqplan.pl                                    |    2 +-
 cataloguing/value_builder/dateaccessioned.pl       |    4 +-
 cataloguing/value_builder/macles.pl                |  123 ++++++++++++--------
 cataloguing/value_builder/unimarc_field_4XX.pl     |   15 ++-
 .../en/includes/acquisitions-add-to-basket.inc     |    2 +-
 .../prog/en/modules/acqui/neworderempty.tt         |   52 ++++++++-
 .../prog/en/modules/acqui/supplier.tt              |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    2 +-
 .../en/modules/cataloguing/value_builder/macles.tt |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |   10 ++
 .../prog/en/modules/installer/auth.tt              |    2 +-
 .../prog/en/modules/members/readingrec.tt          |    5 +-
 .../prog/en/modules/serials/claims.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   10 +-
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    8 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tt   |   22 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    6 +
 labels/label-create-pdf.pl                         |   10 +-
 labels/label-create-xml.pl                         |   27 ++++-
 labels/label-edit-batch.pl                         |    9 +-
 labels/label-print.pl                              |   15 ++-
 members/member.pl                                  |    2 +-
 misc/translator/xgettext.pl                        |    2 +-
 opac/opac-user.pl                                  |   21 ++++
 suggestion/suggestion.pl                           |    2 +-
 36 files changed, 329 insertions(+), 152 deletions(-)
 copy tools/upload-file-progress.pl => acqui/check_duplicate_barcode_ajax.pl (51%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 17:42:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:42:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-38-g1e2f697
Message-ID: <E1RQiZZ-00043n-Og@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  1e2f697e3bca3c9068e1864db63d0b112b4273a4 (commit)
      from  93e597b5ea5fc23c737c6e0e8bb42f763e3125d5 (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:
 etc/zebradb/etc/word-phrase-utf.chr |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 17:46:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:46:34 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_4161
	created. v3.06.00-39-g5d5a047
Message-ID: <E1RQid8-00046K-Cl@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_4161 has been created
        at  5d5a04798449d1725042adb872d4acf51af672f8 (commit)

- Log -----------------------------------------------------------------
commit 5d5a04798449d1725042adb872d4acf51af672f8
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 17:48:29 2011 +0200

    Bug 4161: Preselect active currency for new vendors
    
    Currently when creating a new vendor in acquisitions the alphabetical first
    currency will be preselected. For better usability and less mistakes the
    active curency should be preselected.
    
    To test:
    Check your currency settings in administration.
    Your active currency should not be the first in the list.
    
    1) Create a new vendor
    Verify the active currency is selected for list and invoice prices.
    
    2) Check vendor summary page
    Verify the correct currencies from the vendor record are shown here.
    
    3) Edit vendor
    Verify the correct currencies from the vendor record  are shown here.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified with tests 1, 2, and 3.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 17:46:59 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:46:59 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-39-g5d5a047
Message-ID: <E1RQidX-000478-Nn@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  5d5a04798449d1725042adb872d4acf51af672f8 (commit)
      from  1e2f697e3bca3c9068e1864db63d0b112b4273a4 (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/supplier.pl |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 17:48:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:48:37 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_4518
	created. v3.06.00-40-ge0b029a
Message-ID: <E1RQif7-00048a-Hp@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_4518 has been created
        at  e0b029a4f5ff378291e86fa55e07841297d611e7 (commit)

- Log -----------------------------------------------------------------
commit e0b029a4f5ff378291e86fa55e07841297d611e7
Author: Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>
Date:   Mon May 17 15:43:37 2010 +0200

    (bug #4518) enhance 2.2 to 3.0 scripts
    
    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 Nov 16 17:49:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:49:06 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-40-ge0b029a
Message-ID: <E1RQifa-00049M-Dm@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  e0b029a4f5ff378291e86fa55e07841297d611e7 (commit)
      from  5d5a04798449d1725042adb872d4acf51af672f8 (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/migration_tools/22_to_30/missing090field.pl   |    4 ++-
 .../22_to_30/move_marc_to_authheader.pl            |    2 +-
 misc/migration_tools/upgradeitems.pl               |   23 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 17:51:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 16:51:38 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-41-g55162ca
Message-ID: <E1RQii2-0004Az-O9@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  55162ca84647b4ebc1b8a91ee94997ff7583ef15 (commit)
      from  e0b029a4f5ff378291e86fa55e07841297d611e7 (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 55162ca84647b4ebc1b8a91ee94997ff7583ef15
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Nov 10 16:28:53 2011 -0500

    Follow-up fix for Bug 5150 - Issuing should read Circulation
    
    Really just a typo, but I found it when trying to chase
    down instances of this bug, so here you go.

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 18:10:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 17:10:13 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7207
	created. v3.06.00-42-g7824a1b
Message-ID: <E1RQj01-0004Fy-FA@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_7207 has been created
        at  7824a1bc8da020b11fa9473f09fb7c6429390034 (commit)

- Log -----------------------------------------------------------------
commit 7824a1bc8da020b11fa9473f09fb7c6429390034
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Wed Nov 9 14:51:01 2011 -0500

    Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.
    
    squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.
    
    Don't change $_ in a list context
    
    Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.
    
    Signed-off-by: Brendan <brendan at bywatersolutions.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 18:10:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 17:10:37 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-42-g7824a1b
Message-ID: <E1RQj0P-0004Gu-98@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  7824a1bc8da020b11fa9473f09fb7c6429390034 (commit)
      from  55162ca84647b4ebc1b8a91ee94997ff7583ef15 (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:
 labels/label-print.pl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 18:38:42 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 17:38:42 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.00-37-g06d7875
Message-ID: <E1RQjRa-0004Se-It@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.6.x has been updated
       via  06d787536c4371b0cf6f1955366bf8fecb618d29 (commit)
       via  4c9e5d30823401ebe465bada4b78790590ce1820 (commit)
       via  8c4e0fbd231d5024e7d11e7cb40b8195624f075a (commit)
       via  c7c50eff51d2178532ab388dc1286256e845ff1c (commit)
       via  ff96db8a5491205bb919ee92a86d9735bddf3098 (commit)
      from  604216acf6f173d7576a47395aceeebc87b0d493 (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 06d787536c4371b0cf6f1955366bf8fecb618d29
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Wed Nov 9 14:51:01 2011 -0500

    Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.
    
    squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.
    
    Don't change $_ in a list context
    
    Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.
    
    Signed-off-by: Brendan <brendan at bywatersolutions.com>
    (cherry picked from commit 7824a1bc8da020b11fa9473f09fb7c6429390034)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4c9e5d30823401ebe465bada4b78790590ce1820
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Nov 10 16:28:53 2011 -0500

    Follow-up fix for Bug 5150 - Issuing should read Circulation
    
    Really just a typo, but I found it when trying to chase
    down instances of this bug, so here you go.
    (cherry picked from commit 55162ca84647b4ebc1b8a91ee94997ff7583ef15)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8c4e0fbd231d5024e7d11e7cb40b8195624f075a
Author: Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>
Date:   Mon May 17 15:43:37 2010 +0200

    (bug #4518) enhance 2.2 to 3.0 scripts
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e0b029a4f5ff378291e86fa55e07841297d611e7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c7c50eff51d2178532ab388dc1286256e845ff1c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 17:48:29 2011 +0200

    Bug 4161: Preselect active currency for new vendors
    
    Currently when creating a new vendor in acquisitions the alphabetical first
    currency will be preselected. For better usability and less mistakes the
    active curency should be preselected.
    
    To test:
    Check your currency settings in administration.
    Your active currency should not be the first in the list.
    
    1) Create a new vendor
    Verify the active currency is selected for list and invoice prices.
    
    2) Check vendor summary page
    Verify the correct currencies from the vendor record are shown here.
    
    3) Edit vendor
    Verify the correct currencies from the vendor record  are shown here.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified with tests 1, 2, and 3.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 5d5a04798449d1725042adb872d4acf51af672f8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ff96db8a5491205bb919ee92a86d9735bddf3098
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Sep 26 16:38:39 2011 -0400

    Bug 2629: Add diacritic support for ? (U with ring)
    
    Adds ? and ? support to word-phrase-utf.chr.  These characters are used in
    Czech, for example the author Martinu?, Bohuslav (1890-1959)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 1e2f697e3bca3c9068e1864db63d0b112b4273a4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 acqui/supplier.pl                                  |   18 ++++++++++++---
 etc/zebradb/etc/word-phrase-utf.chr                |    2 +
 .../prog/en/modules/help/reports/catalogue_out.tt  |    2 +-
 labels/label-print.pl                              |    6 ++--
 misc/migration_tools/22_to_30/missing090field.pl   |    4 ++-
 .../22_to_30/move_marc_to_authheader.pl            |    2 +-
 misc/migration_tools/upgradeitems.pl               |   23 ++++++++++++++++++-
 7 files changed, 45 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 16 18:41:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 16 Nov 2011 17:41:54 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.06-33-g377dc9d
Message-ID: <E1RQjUg-0004Tx-5r@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  377dc9d0cf325882bc32c7b1b88b1f01a59023ba (commit)
       via  d4aa764f801ac463d099378989c07fe12d86e6ba (commit)
       via  dcc54d3308cafedf31c9a8194ba7ef107ea949f1 (commit)
       via  40bad4cfa81198dd5697f30f731002ea30e11e06 (commit)
      from  319aaca81fd0728dc6ff4730d968ba2fcc8e911c (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 377dc9d0cf325882bc32c7b1b88b1f01a59023ba
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Wed Nov 9 14:51:01 2011 -0500

    Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.
    
    squashed chris_n's two patches. Label export works again. Also changed the pattern for the item_number to the known working, critic friendly pattern.
    
    Don't change $_ in a list context
    
    Changed the 3rd bit to the critic friendly pattern chris_n suggests in the previous two lines.
    
    Signed-off-by: Brendan <brendan at bywatersolutions.com>
    (cherry picked from commit 7824a1bc8da020b11fa9473f09fb7c6429390034)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d4aa764f801ac463d099378989c07fe12d86e6ba
Author: Nahuel ANGELINETTI <nahuel.angelinetti at biblibre.com>
Date:   Mon May 17 15:43:37 2010 +0200

    (bug #4518) enhance 2.2 to 3.0 scripts
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit e0b029a4f5ff378291e86fa55e07841297d611e7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit dcc54d3308cafedf31c9a8194ba7ef107ea949f1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 17:48:29 2011 +0200

    Bug 4161: Preselect active currency for new vendors
    
    Currently when creating a new vendor in acquisitions the alphabetical first
    currency will be preselected. For better usability and less mistakes the
    active curency should be preselected.
    
    To test:
    Check your currency settings in administration.
    Your active currency should not be the first in the list.
    
    1) Create a new vendor
    Verify the active currency is selected for list and invoice prices.
    
    2) Check vendor summary page
    Verify the correct currencies from the vendor record are shown here.
    
    3) Edit vendor
    Verify the correct currencies from the vendor record  are shown here.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified with tests 1, 2, and 3.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 5d5a04798449d1725042adb872d4acf51af672f8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 40bad4cfa81198dd5697f30f731002ea30e11e06
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Sep 26 16:38:39 2011 -0400

    Bug 2629: Add diacritic support for ? (U with ring)
    
    Adds ? and ? support to word-phrase-utf.chr.  These characters are used in
    Czech, for example the author Martinu?, Bohuslav (1890-1959)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 1e2f697e3bca3c9068e1864db63d0b112b4273a4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 acqui/supplier.pl                                  |   18 ++++++++++++---
 etc/zebradb/etc/word-phrase-utf.chr                |    2 +
 labels/label-print.pl                              |    6 ++--
 misc/migration_tools/22_to_30/missing090field.pl   |    4 ++-
 .../22_to_30/move_marc_to_authheader.pl            |    2 +-
 misc/migration_tools/upgradeitems.pl               |   23 ++++++++++++++++++-
 6 files changed, 44 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 16:51:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 15:51:04 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-44-g2216cd4
Message-ID: <E1RR4Ey-0005t0-F6@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  2216cd4371a72d95491dc51455d1ae7a6c783147 (commit)
       via  1d0192b85ceabca3dbb0add7df218a4d768ea104 (commit)
      from  7824a1bc8da020b11fa9473f09fb7c6429390034 (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 2216cd4371a72d95491dc51455d1ae7a6c783147
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Nov 17 16:50:54 2011 +0100

    updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th

commit 1d0192b85ceabca3dbb0add7df218a4d768ea104
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Mon Nov 14 17:23:49 2011 -0500

    Bug 7221: C4/Biblio.pm documentation is incorrect.
    
    $dbh is not a valid first parameter.  Removed $dbh from line 392 to show correct syntax.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>

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

Summary of changes:
 C4/Biblio.pm     |    2 +-
 docs/history.txt |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 16:59:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 15:59:39 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6321
	created. v3.06.00-45-gbada2e4
Message-ID: <E1RR4NH-0005vg-ML@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_6321 has been created
        at  bada2e4c36f3e6ec163e5f53e4e4c9d1c9f0dd6f (commit)

- Log -----------------------------------------------------------------
commit bada2e4c36f3e6ec163e5f53e4e4c9d1c9f0dd6f
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Fri May 13 11:33:58 2011 +0100

    Bug 6321 Add a 1/4 months frequency
    
    Thanks Stefano Bargioni for the typo fix
    
    [2011.09.16] Thanks Paul for catching the display error.
    [2011.10.11] Thanks Katrin for finding display error on OPAC.
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tested prediction pattern and display in OPAC.
    No problems found.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:00:53 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:00:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-45-gbada2e4
Message-ID: <E1RR4OT-0005wn-7A@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  bada2e4c36f3e6ec163e5f53e4e4c9d1c9f0dd6f (commit)
      from  2216cd4371a72d95491dc51455d1ae7a6c783147 (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/Serials.pm                                      |   11 ++++++++++-
 .../prog/en/modules/serials/subscription-add.tt    |    5 +++++
 .../prog/en/modules/serials/subscription-detail.tt |    2 +-
 .../prog/en/modules/opac-serial-issues.tt          |    3 +++
 4 files changed, 19 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:05:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:05:46 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6916
	created. v3.06.00-46-ge7251f7
Message-ID: <E1RR4TC-0005z5-5l@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_6916 has been created
        at  e7251f73a2bb1fbf8c047f19f210d7bcc591cddf (commit)

- Log -----------------------------------------------------------------
commit e7251f73a2bb1fbf8c047f19f210d7bcc591cddf
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Jul 16 14:45:58 2010 +1200

    Bug 6916 - item's acq date now takes you to its invoice
    
    When viewing an item's details, selecting the accession date for it now
    takes you to the invoice for that item.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    This works as advertised.
    1) Order and receive an item in acquisition
    2) Search for it in staff and go to the 'items' tab
    3) Click on the 'receive date' link
    
    Fixed conflict in moredetail.pl.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    QA. This patch does only work when AcqCreateItem==placing an order. This is caused by an existing bug. See Bugzilla for more details.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:06:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:06:04 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-46-ge7251f7
Message-ID: <E1RR4TU-0005zr-Pm@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  e7251f73a2bb1fbf8c047f19f210d7bcc591cddf (commit)
      from  bada2e4c36f3e6ec163e5f53e4e4c9d1c9f0dd6f (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/moredetail.pl                            |    6 +++++-
 .../prog/en/modules/catalogue/moredetail.tt        |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:08:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:08:46 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7033
	created. v3.06.00-47-g8fde309
Message-ID: <E1RR4W6-00060f-4T@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_7033 has been created
        at  8fde30912ec89c8855a7b4d468f5e48e7b886e85 (commit)

- Log -----------------------------------------------------------------
commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 14 15:52:30 2011 -0400

    Make all strings translatable in marc21_field_007.tt
    
    http://bugs.koha-community.org/show_bug.cgi?id=7033
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan:
    - apply patch
    - update po files using 'perl translate update <language-code>
    - check po files for new strings from 007 plugin
    - translate some / all of them
    - update templates with changed po files 'perl translate install <language-code>
    - verify 007 still works and got translated

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:09:12 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:09:12 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-47-g8fde309
Message-ID: <E1RR4WW-00061R-Sd@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  8fde30912ec89c8855a7b4d468f5e48e7b886e85 (commit)
      from  e7251f73a2bb1fbf8c047f19f210d7bcc591cddf (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/marc21_field_007.tt  | 7684 +++++++++++++++-----
 1 files changed, 5763 insertions(+), 1921 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:12:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:12:50 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7079
	created. v3.06.00-48-gc1d824d
Message-ID: <E1RR4a2-00062f-Ct@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_7079 has been created
        at  c1d824deaa65f0a64071e6925ae2238beb0a0912 (commit)

- Log -----------------------------------------------------------------
commit c1d824deaa65f0a64071e6925ae2238beb0a0912
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 14:57:52 2011 +0200

    Bug 7079: [SIGNED-OFF] Default values for German system preferences
    
    Patch adds updates for system preferences to the sql file
    in the installer directory:
    
    - New: AmazonLocale: DE
    - borrowerRelationship: Vater|Mutter
    - BorrowersTitles: Herr|Frau
    - New: CurrencyFormat: FR
    - New: dateformat: metric
    - New: DefaultClassificationSource: z
    - New: OpacMainUserBlock: translated content
    - New: OpacNav: translated content
    - New: OpacNavBottom: translated content
    - New: OPACSearchForTitleIn: translated content
    
    To test:
    A) Do a full installation with German sample files
    B) Run the sql file 'system_preferences.sql' against your database
    
    Verfy values of system preferences have been changed.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Patch applied cleanly. I ran through the webinstaller in German on an empty
    database, and made sure system_preferences were loaded. No complaints from
    the database and the systprefs are set to the right values when I check in the
    staff client.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:13:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:13:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-48-gc1d824d
Message-ID: <E1RR4aQ-00063q-3s@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  c1d824deaa65f0a64071e6925ae2238beb0a0912 (commit)
      from  8fde30912ec89c8855a7b4d468f5e48e7b886e85 (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/de-DE/mandatory/system_preferences.sql   |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:28:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:28:10 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7084
	created. v3.06.00-49-g1d42be9
Message-ID: <E1RR4os-000687-EN@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_7084 has been created
        at  1d42be9e7670a3489be681494a8b782c855d52fb (commit)

- Log -----------------------------------------------------------------
commit 1d42be9e7670a3489be681494a8b782c855d52fb
Author: Liz Rea <lrea at nekls.org>
Date:   Mon Oct 24 15:26:32 2011 -0500

    Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to
    
    To test:
    Verify that New Tag text is the same size as all of the other surrounding text.
    Verify that it is consistent in size with results that have existing tags.
    
    See screenshot for what it looked like before:
    http://screencast.com/t/hnt15kpS7SH9
    Notice that the Add button and New tag text were slightly larger than the
    similar constructions for results with existing tags. This patch should fix
    that.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    I made sure I had a results list with on record with tags and one without.
    Before applying the patch the "New tag" text and "Add" button were
    inconsistent for the two records, after applying it they look the same. Nice!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 17 17:28:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 17 Nov 2011 16:28:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-49-g1d42be9
Message-ID: <E1RR4pI-00068t-10@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  1d42be9e7670a3489be681494a8b782c855d52fb (commit)
      from  c1d824deaa65f0a64071e6925ae2238beb0a0912 (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-tmpl/prog/en/modules/opac-results.tt      |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 02:36:17 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 01:36:17 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.00-41-g5006dd4
Message-ID: <E1RRDNJ-0008Pr-1Y@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.6.x has been updated
       via  5006dd4858f5b0b50acdaec4d2e0dbe821753c60 (commit)
       via  6f259d2a670e06b2b58c4e4fe6d3ef8332360e85 (commit)
       via  f67b30e318cb494fb07e80c96fcb5e756b18c96b (commit)
       via  7e12f5af01560cb0adf8cf3932503c35b4c6aaa8 (commit)
      from  06d787536c4371b0cf6f1955366bf8fecb618d29 (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 5006dd4858f5b0b50acdaec4d2e0dbe821753c60
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Nov 17 16:50:54 2011 +0100

    updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
    (cherry picked from commit 2216cd4371a72d95491dc51455d1ae7a6c783147)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6f259d2a670e06b2b58c4e4fe6d3ef8332360e85
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 14 15:52:30 2011 -0400

    Make all strings translatable in marc21_field_007.tt
    
    http://bugs.koha-community.org/show_bug.cgi?id=7033
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan:
    - apply patch
    - update po files using 'perl translate update <language-code>
    - check po files for new strings from 007 plugin
    - translate some / all of them
    - update templates with changed po files 'perl translate install <language-code>
    - verify 007 still works and got translated
    (cherry picked from commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f67b30e318cb494fb07e80c96fcb5e756b18c96b
Author: Liz Rea <lrea at nekls.org>
Date:   Mon Oct 24 15:26:32 2011 -0500

    Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to
    
    To test:
    Verify that New Tag text is the same size as all of the other surrounding text.
    Verify that it is consistent in size with results that have existing tags.
    
    See screenshot for what it looked like before:
    http://screencast.com/t/hnt15kpS7SH9
    Notice that the Add button and New tag text were slightly larger than the
    similar constructions for results with existing tags. This patch should fix
    that.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    I made sure I had a results list with on record with tags and one without.
    Before applying the patch the "New tag" text and "Add" button were
    inconsistent for the two records, after applying it they look the same. Nice!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 1d42be9e7670a3489be681494a8b782c855d52fb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7e12f5af01560cb0adf8cf3932503c35b4c6aaa8
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Mon Nov 14 17:23:49 2011 -0500

    Bug 7221: C4/Biblio.pm documentation is incorrect.
    
    $dbh is not a valid first parameter.  Removed $dbh from line 392 to show correct syntax.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    (cherry picked from commit 1d0192b85ceabca3dbb0add7df218a4d768ea104)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |    2 +-
 docs/history.txt                                   |    6 +-
 .../cataloguing/value_builder/marc21_field_007.tt  | 7684 +++++++++++++++-----
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 4 files changed, 5771 insertions(+), 1925 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 03:05:17 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 02:05:17 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.06-37-g35234b4
Message-ID: <E1RRDpN-00005l-RC@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  35234b478a6017fb04cc8d0a64ddf177974b5727 (commit)
       via  631a03a443745bd3f24d7ace836ffdbdc5e24a68 (commit)
       via  24dfa988c337a4cdf22005921fd8a7b8e32f3b06 (commit)
       via  c21a7f078b6d89d564f40fa5605c91f381a08c8d (commit)
      from  377dc9d0cf325882bc32c7b1b88b1f01a59023ba (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 35234b478a6017fb04cc8d0a64ddf177974b5727
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Nov 17 16:50:54 2011 +0100

    updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
    (cherry picked from commit 2216cd4371a72d95491dc51455d1ae7a6c783147)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 631a03a443745bd3f24d7ace836ffdbdc5e24a68
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 14 15:52:30 2011 -0400

    Make all strings translatable in marc21_field_007.tt
    
    http://bugs.koha-community.org/show_bug.cgi?id=7033
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test plan:
    - apply patch
    - update po files using 'perl translate update <language-code>
    - check po files for new strings from 007 plugin
    - translate some / all of them
    - update templates with changed po files 'perl translate install <language-code>
    - verify 007 still works and got translated
    (cherry picked from commit 8fde30912ec89c8855a7b4d468f5e48e7b886e85)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 24dfa988c337a4cdf22005921fd8a7b8e32f3b06
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Mon Nov 14 17:23:49 2011 -0500

    Bug 7221: C4/Biblio.pm documentation is incorrect.
    
    $dbh is not a valid first parameter.  Removed $dbh from line 392 to show correct syntax.
    
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    (cherry picked from commit 1d0192b85ceabca3dbb0add7df218a4d768ea104)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c21a7f078b6d89d564f40fa5605c91f381a08c8d
Author: Liz Rea <lrea at nekls.org>
Date:   Mon Oct 24 15:26:32 2011 -0500

    Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to
    
    To test:
    Verify that New Tag text is the same size as all of the other surrounding text.
    Verify that it is consistent in size with results that have existing tags.
    
    See screenshot for what it looked like before:
    http://screencast.com/t/hnt15kpS7SH9
    Notice that the Add button and New tag text were slightly larger than the
    similar constructions for results with existing tags. This patch should fix
    that.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    I made sure I had a results list with on record with tags and one without.
    Before applying the patch the "New tag" text and "Add" button were
    inconsistent for the two records, after applying it they look the same. Nice!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 1d42be9e7670a3489be681494a8b782c855d52fb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |    2 +-
 docs/history.txt                                   |    6 +-
 .../cataloguing/value_builder/marc21_field_007.tt  | 7684 +++++++++++++++-----
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    4 +-
 4 files changed, 5771 insertions(+), 1925 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 22:37:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 21:37:23 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6475
	created. v3.06.00-50-g042f89e
Message-ID: <E1RRW7f-0004Om-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/bug_6475 has been created
        at  042f89e939984b2b9e568622e0b99c95db09750e (commit)

- Log -----------------------------------------------------------------
commit 042f89e939984b2b9e568622e0b99c95db09750e
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date:   Wed Jun 22 18:18:40 2011 +0200

    Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
    
    When trying to modify the subfield "0" on a field in the
    MARC subfield structure admin -> Tag xxx Subfield Constraints,
    the boolean condition on liblibrarian fails for the initial "0" value.
    Modified condition to allow the value "0"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 22:38:13 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 21:38:13 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-50-g042f89e
Message-ID: <E1RRW8T-0004PZ-65@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  042f89e939984b2b9e568622e0b99c95db09750e (commit)
      from  1d42be9e7670a3489be681494a8b782c855d52fb (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:
 admin/marc_subfields_structure.pl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 22:45:58 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 21:45:58 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-51-g6dac727
Message-ID: <E1RRWFx-0004Rq-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  6dac7273fbc2eff7805d2a9bda1eb9a275962c00 (commit)
      from  042f89e939984b2b9e568622e0b99c95db09750e (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 6dac7273fbc2eff7805d2a9bda1eb9a275962c00
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 21 12:04:03 2011 -0400

    Bug 6977: Follow-up patch : catch CloneSubfield errors
    
    A javascript error could occur if the CloneSubfield function failed for
    any reason. This would prevent the popup from disappearing.
    
    Example : Importing informations of a UNIF_TITLE authority with multiple
    $x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
    error occurs when trying to clone it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6977
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

Summary of changes:
 .../authorities/blinddetail-biblio-search.tt       |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 22:48:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 21:48:40 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6977
	updated. v3.04.00-695-gdcdd9b4
Message-ID: <E1RRWIa-0004TT-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, new/bug_6977 has been updated
       via  dcdd9b4d6d1eea478ac39940396c231d9270c0f0 (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 -----------------------------------------------------------------
commit dcdd9b4d6d1eea478ac39940396c231d9270c0f0
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 21 12:04:03 2011 -0400

    Bug 6977: Follow-up patch : catch CloneSubfield errors
    
    A javascript error could occur if the CloneSubfield function failed for
    any reason. This would prevent the popup from disappearing.
    
    Example : Importing informations of a UNIF_TITLE authority with multiple
    $x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
    error occurs when trying to clone it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6977

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

Summary of changes:
 .../authorities/blinddetail-biblio-search.tt       |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 22:53:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 21:53:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-52-ga340ded
Message-ID: <E1RRWNc-0004Vg-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  a340ded2ca5b95b1ae4f14423cab3fda107ed597 (commit)
      from  6dac7273fbc2eff7805d2a9bda1eb9a275962c00 (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 a340ded2ca5b95b1ae4f14423cab3fda107ed597
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 26 11:14:05 2011 -0400

    Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

Summary of changes:
 t/00-merge-conflict-markers.t |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:01:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:01:36 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7134
	created. v3.06.00-53-g440c0f2
Message-ID: <E1RRWV6-0004Y5-5P@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_7134 has been created
        at  440c0f21ee59664bfbd2238c638f84a6af3d9d80 (commit)

- Log -----------------------------------------------------------------
commit 440c0f21ee59664bfbd2238c638f84a6af3d9d80
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Nov 17 10:27:47 2011 -0500

    Bug 7134: patron records getting corrupted birthdates
    
    If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
    is obviously incorrect (the result of passing 0 to the database directly)
    
    The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
    for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
    search, but testing will be required.
    
    To test:
    1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
    2. search for a borrower by 1 part surname, confirm search works
    3. search for a borrower by 2 part surname, confirm search works
    4. search for a borrower across firstname AND surname; confirm
    5. search for a borrower and include categorycode/branchcode filters
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    I confirm all working tests 1-5
    1. Created patron with blank birthdate - birthdate was blank
    2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
    3. Searched for mr. acevedo using "Acevedo III" - result was correct
    4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
    5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
    
    also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
    Not complaining, just noting. :)
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:02:19 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:02:19 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-53-g440c0f2
Message-ID: <E1RRWVn-0004ZG-QW@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  440c0f21ee59664bfbd2238c638f84a6af3d9d80 (commit)
      from  a340ded2ca5b95b1ae4f14423cab3fda107ed597 (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/SQLHelper.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:12:46 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:12:46 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_2847
	created. v3.06.00-54-gbfe06ef
Message-ID: <E1RRWfu-0004bk-CJ@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_2847 has been created
        at  bfe06ef399da831e5602784fbe54cea6dfc1ab65 (commit)

- Log -----------------------------------------------------------------
commit bfe06ef399da831e5602784fbe54cea6dfc1ab65
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Nov 11 12:34:44 2011 -0500

    Incremental fix for Bug 2847, Use HTML escape in templates where appropriate
    
    Fixes for output in a couple of acquisitions templates where
    user-generated data should be escaped. This instances were found
    by creating a vendor name like "Baker & Taylor" and finding
    that the ampersand was not escaped, causing validation errors.
    
    This patch also consolidates multiple <script> blocks which
    do not need to be separate and corrects a couple of unclosed
    <input> tags.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:13:25 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:13:25 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-54-gbfe06ef
Message-ID: <E1RRWgX-0004cW-Gk@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  bfe06ef399da831e5602784fbe54cea6dfc1ab65 (commit)
      from  440c0f21ee59664bfbd2238c638f84a6af3d9d80 (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/acquisitions-search.inc       |    6 +++---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   17 +++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:31:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:31:22 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6799
	created. v3.06.00-56-g4ce57a1
Message-ID: <E1RRWxu-0004gg-Qx@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_6799 has been created
        at  4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7 (commit)

- Log -----------------------------------------------------------------
commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Aug 27 13:32:08 2011 +0200

    Bug 6799 rebuild_zebra.pl -x produces invalid XML records
    
    This patch allow to handle properly items containing extended characters and
    send valid XML records to zebraidx
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 18 23:28:38 2011 +0100

    Joy nelson was already in history.txt, removing the entry

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 18 23:31:45 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 18 Nov 2011 22:31:45 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-56-g4ce57a1
Message-ID: <E1RRWyH-0004hS-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, master has been updated
       via  4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7 (commit)
       via  9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5 (commit)
      from  bfe06ef399da831e5602784fbe54cea6dfc1ab65 (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:
 docs/history.txt                      |    2 +-
 misc/migration_tools/rebuild_zebra.pl |   12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Nov 19 23:06:55 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 19 Nov 2011 22:06:55 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.00-48-g16189ed
Message-ID: <E1RRt3n-0001e2-P7@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.6.x has been updated
       via  16189ed8c37960a76d80899004654e617d98bcde (commit)
       via  7e92a497aa2d1c25ab0950855e1a57fc1dd897d1 (commit)
       via  4d09e483846fb6d8d1df2f44eae874ba074db3a7 (commit)
       via  112c4363396b220146a4a5bb10f28f0b30de9da0 (commit)
       via  b7e29b201ac85c2483b1d7877e330bc9f3acee2d (commit)
       via  35eb4ced52459a8c4e84a8cd16ff4fa76be15c58 (commit)
       via  5d529084c3ef1a1aa45d7919f823474583ec5d88 (commit)
      from  5006dd4858f5b0b50acdaec4d2e0dbe821753c60 (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 16189ed8c37960a76d80899004654e617d98bcde
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 18 23:28:38 2011 +0100

    Joy nelson was already in history.txt, removing the entry
    (cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7e92a497aa2d1c25ab0950855e1a57fc1dd897d1
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Nov 11 12:34:44 2011 -0500

    Incremental fix for Bug 2847, Use HTML escape in templates where appropriate
    
    Fixes for output in a couple of acquisitions templates where
    user-generated data should be escaped. This instances were found
    by creating a vendor name like "Baker & Taylor" and finding
    that the ampersand was not escaped, causing validation errors.
    
    This patch also consolidates multiple <script> blocks which
    do not need to be separate and corrects a couple of unclosed
    <input> tags.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit bfe06ef399da831e5602784fbe54cea6dfc1ab65)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4d09e483846fb6d8d1df2f44eae874ba074db3a7
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Aug 27 13:32:08 2011 +0200

    Bug 6799 rebuild_zebra.pl -x produces invalid XML records
    
    This patch allow to handle properly items containing extended characters and
    send valid XML records to zebraidx
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 112c4363396b220146a4a5bb10f28f0b30de9da0
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 26 11:14:05 2011 -0400

    Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit a340ded2ca5b95b1ae4f14423cab3fda107ed597)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b7e29b201ac85c2483b1d7877e330bc9f3acee2d
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 21 12:04:03 2011 -0400

    Bug 6977: Follow-up patch : catch CloneSubfield errors
    
    A javascript error could occur if the CloneSubfield function failed for
    any reason. This would prevent the popup from disappearing.
    
    Example : Importing informations of a UNIF_TITLE authority with multiple
    $x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
    error occurs when trying to clone it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6977
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6dac7273fbc2eff7805d2a9bda1eb9a275962c00)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 35eb4ced52459a8c4e84a8cd16ff4fa76be15c58
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date:   Wed Jun 22 18:18:40 2011 +0200

    Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
    
    When trying to modify the subfield "0" on a field in the
    MARC subfield structure admin -> Tag xxx Subfield Constraints,
    the boolean condition on liblibrarian fails for the initial "0" value.
    Modified condition to allow the value "0"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 042f89e939984b2b9e568622e0b99c95db09750e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5d529084c3ef1a1aa45d7919f823474583ec5d88
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Nov 17 10:27:47 2011 -0500

    Bug 7134: patron records getting corrupted birthdates
    
    If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
    is obviously incorrect (the result of passing 0 to the database directly)
    
    The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
    for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
    search, but testing will be required.
    
    To test:
    1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
    2. search for a borrower by 1 part surname, confirm search works
    3. search for a borrower by 2 part surname, confirm search works
    4. search for a borrower across firstname AND surname; confirm
    5. search for a borrower and include categorycode/branchcode filters
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    I confirm all working tests 1-5
    1. Created patron with blank birthdate - birthdate was blank
    2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
    3. Searched for mr. acevedo using "Acevedo III" - result was correct
    4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
    5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
    
    also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
    Not complaining, just noting. :)
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 440c0f21ee59664bfbd2238c638f84a6af3d9d80)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/SQLHelper.pm                                    |    2 +-
 admin/marc_subfields_structure.pl                  |    2 +-
 docs/history.txt                                   |    2 +-
 .../prog/en/includes/acquisitions-search.inc       |    6 +++---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   17 +++++------------
 .../authorities/blinddetail-biblio-search.tt       |   16 ++++++++++++----
 misc/migration_tools/rebuild_zebra.pl              |   12 +++++-------
 t/00-merge-conflict-markers.t                      |    3 +--
 8 files changed, 29 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Nov 20 03:25:33 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 20 Nov 2011 02:25:33 +0000
Subject: [koha-commits] main Koha release repository branch 3.4.x updated.
	v3.04.06-43-g170950e
Message-ID: <E1RRx65-0002wr-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, 3.4.x has been updated
       via  170950e91bf3906debe7552d5498d176ba1e793d (commit)
       via  eb19d92d3b280483da57c21e1d3d4e1fdf9fbff5 (commit)
       via  b253e07fca6fc8c8d3ac9f9c408c4d8d63b7f177 (commit)
       via  f74ed5ad8a3b4878f7f89e82ba0a55a019a341aa (commit)
       via  29395af9796095b2b62c4307a7ef7d3fba6931d2 (commit)
       via  12f6201ea90fac634ea58dd950914d32060e68f4 (commit)
      from  35234b478a6017fb04cc8d0a64ddf177974b5727 (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 170950e91bf3906debe7552d5498d176ba1e793d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 18 23:28:38 2011 +0100

    Joy nelson was already in history.txt, removing the entry
    (cherry picked from commit 9c5d3ea3aa28b71f0fb4148b8fdf9f2a002f79f5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit eb19d92d3b280483da57c21e1d3d4e1fdf9fbff5
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sat Aug 27 13:32:08 2011 +0200

    Bug 6799 rebuild_zebra.pl -x produces invalid XML records
    
    This patch allow to handle properly items containing extended characters and
    send valid XML records to zebraidx
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b253e07fca6fc8c8d3ac9f9c408c4d8d63b7f177
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 26 11:14:05 2011 -0400

    Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit a340ded2ca5b95b1ae4f14423cab3fda107ed597)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f74ed5ad8a3b4878f7f89e82ba0a55a019a341aa
Author: Fr?d?rick Capovilla <frederick.capovilla at libeo.com>
Date:   Fri Oct 21 12:04:03 2011 -0400

    Bug 6977: Follow-up patch : catch CloneSubfield errors
    
    A javascript error could occur if the CloneSubfield function failed for
    any reason. This would prevent the popup from disappearing.
    
    Example : Importing informations of a UNIF_TITLE authority with multiple
    $x subfields in the biblio's 440 field. 440$x isn't repeatable, so an
    error occurs when trying to clone it.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6977
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6dac7273fbc2eff7805d2a9bda1eb9a275962c00)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 29395af9796095b2b62c4307a7ef7d3fba6931d2
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date:   Wed Jun 22 18:18:40 2011 +0200

    Bug 6475 - Edit it's not possible in subfield "0" in MARC framework
    
    When trying to modify the subfield "0" on a field in the
    MARC subfield structure admin -> Tag xxx Subfield Constraints,
    the boolean condition on liblibrarian fails for the initial "0" value.
    Modified condition to allow the value "0"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 042f89e939984b2b9e568622e0b99c95db09750e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 12f6201ea90fac634ea58dd950914d32060e68f4
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Nov 17 10:27:47 2011 -0500

    Bug 7134: patron records getting corrupted birthdates
    
    If no date of birth is provided in a new member form, the borrower gets the birthdate of "00/02/0", which
    is obviously incorrect (the result of passing 0 to the database directly)
    
    The fix is to remove a conditional check buried deep in C4::SQLHelper.  This is in a helper subroutine that was changed
    for the Unified Member Search dev (bug 6253).  Reverting this small change to the conditional does not seem to break
    search, but testing will be required.
    
    To test:
    1. apply patch, and create a new patron with blank birthdate.  The new patron should now have a blank birthdate instead of '00/02/0'
    2. search for a borrower by 1 part surname, confirm search works
    3. search for a borrower by 2 part surname, confirm search works
    4. search for a borrower across firstname AND surname; confirm
    5. search for a borrower and include categorycode/branchcode filters
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    I confirm all working tests 1-5
    1. Created patron with blank birthdate - birthdate was blank
    2. Searched for patron "henry james acevedo III" by using "acevedo" - result was correct
    3. Searched for mr. acevedo using "Acevedo III" - result was correct
    4. Searched for Henry James Acevedo III, Henry Acevedo and James Acevedo - results were correct
    5. Searched for Mr Acevedo with the branch he was not in, with the branch he is in, with a category he was not, and a category he was. All results were correct.
    
    also noted: inner searching seems to be working now? Example: Henry James (firstname) Acevedo III (surname) - searching James Acevedo brings back the correct patron.
    Not complaining, just noting. :)
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 440c0f21ee59664bfbd2238c638f84a6af3d9d80)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/SQLHelper.pm                                    |    2 +-
 admin/marc_subfields_structure.pl                  |    2 +-
 docs/history.txt                                   |    2 +-
 .../authorities/blinddetail-biblio-search.tt       |   16 ++++++++++++----
 misc/migration_tools/rebuild_zebra.pl              |   12 +++++-------
 t/00-merge-conflict-markers.t                      |    3 +--
 6 files changed, 21 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 10:28:56 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 09:28:56 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-57-gfda4af9
Message-ID: <E1RTVbz-0007mi-Vq@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  fda4af9a3ee582a483695ba0cab4061101e2d56d (commit)
      from  4ce57a102b1c0404bc4ae67032bcb1cbbc769fc7 (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 fda4af9a3ee582a483695ba0cab4061101e2d56d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 18 12:12:29 2011 +1300

    Bug 7242 : Fixing typo in a div
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 10:47:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 09:47:49 +0000
Subject: [koha-commits] main Koha release repository branch new/enh/bug_4877
	updated. v3.04.00-456-gfab2d8b
Message-ID: <E1RTVuH-0007qN-Oy@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_4877 has been updated
       via  fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d (commit)
      from  ca149ec0bbd576cc9969ab793fc920998a904204 (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 fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Mon Oct 17 12:23:09 2011 +0200

    Bug 4877 - Add DocBook for missing manual pages
    
    Add DocBook manual pages for commands that do not have a manual page yet. Also
    add a page for koha-common itself, listing all the available commands.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    
    Minor change: I fixed a typo I spotted

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

Summary of changes:
 debian/docs/koha-common.xml         |  206 +++++++++++++++++++++++++++++++++++
 debian/docs/koha-create-dirs.xml    |   43 +++++++
 debian/docs/koha-disable.xml        |   45 ++++++++
 debian/docs/koha-dump-defaults.xml  |   44 ++++++++
 debian/docs/koha-dump.xml           |   45 ++++++++
 debian/docs/koha-email-disable.xml  |   42 +++++++
 debian/docs/koha-email-enable.xml   |   42 +++++++
 debian/docs/koha-enable.xml         |   45 ++++++++
 debian/docs/koha-foreach.xml        |   43 +++++++
 debian/docs/koha-list.xml           |   73 ++++++++++++
 debian/docs/koha-mysql.xml          |   44 ++++++++
 debian/docs/koha-rebuild-zebra.xml  |   67 +++++++++++
 debian/docs/koha-remove.xml         |   17 ++-
 debian/docs/koha-reset-passwd.xml   |   44 ++++++++
 debian/docs/koha-restart-zebra.xml  |   44 ++++++++
 debian/docs/koha-restore.xml        |   45 ++++++++
 debian/docs/koha-start-zebra.xml    |   44 ++++++++
 debian/docs/koha-stop-zebra.xml     |   44 ++++++++
 debian/docs/koha-upgrade-schema.xml |   44 ++++++++
 debian/docs/koha-upgrade-to-3.4.xml |   41 +++++++
 20 files changed, 1058 insertions(+), 4 deletions(-)
 create mode 100644 debian/docs/koha-common.xml
 create mode 100644 debian/docs/koha-create-dirs.xml
 create mode 100644 debian/docs/koha-disable.xml
 create mode 100644 debian/docs/koha-dump-defaults.xml
 create mode 100644 debian/docs/koha-dump.xml
 create mode 100644 debian/docs/koha-email-disable.xml
 create mode 100644 debian/docs/koha-email-enable.xml
 create mode 100644 debian/docs/koha-enable.xml
 create mode 100644 debian/docs/koha-foreach.xml
 create mode 100644 debian/docs/koha-list.xml
 create mode 100644 debian/docs/koha-mysql.xml
 create mode 100644 debian/docs/koha-rebuild-zebra.xml
 create mode 100644 debian/docs/koha-reset-passwd.xml
 create mode 100644 debian/docs/koha-restart-zebra.xml
 create mode 100644 debian/docs/koha-restore.xml
 create mode 100644 debian/docs/koha-start-zebra.xml
 create mode 100644 debian/docs/koha-stop-zebra.xml
 create mode 100644 debian/docs/koha-upgrade-schema.xml
 create mode 100644 debian/docs/koha-upgrade-to-3.4.xml


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 10:53:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 09:53:16 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-59-g5c2def5
Message-ID: <E1RTVzY-0007sl-CI@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  5c2def51587c4b2636b5f066306b8bd5dc0e7a7a (commit)
       via  fab2d8b0abdb2a1af711d8b2ee6f287eef35d91d (commit)
      from  fda4af9a3ee582a483695ba0cab4061101e2d56d (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 5c2def51587c4b2636b5f066306b8bd5dc0e7a7a
Merge: fda4af9 fab2d8b
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Thu Nov 24 10:48:14 2011 +0100

    Merge branch 'new/enh/bug_4877'

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

Summary of changes:
 debian/docs/koha-common.xml         |  206 +++++++++++++++++++++++++++++++++++
 debian/docs/koha-create-dirs.xml    |   43 +++++++
 debian/docs/koha-disable.xml        |   45 ++++++++
 debian/docs/koha-dump-defaults.xml  |   44 ++++++++
 debian/docs/koha-dump.xml           |   45 ++++++++
 debian/docs/koha-email-disable.xml  |   42 +++++++
 debian/docs/koha-email-enable.xml   |   42 +++++++
 debian/docs/koha-enable.xml         |   45 ++++++++
 debian/docs/koha-foreach.xml        |   43 +++++++
 debian/docs/koha-list.xml           |   73 ++++++++++++
 debian/docs/koha-mysql.xml          |   44 ++++++++
 debian/docs/koha-rebuild-zebra.xml  |   67 +++++++++++
 debian/docs/koha-remove.xml         |   17 ++-
 debian/docs/koha-reset-passwd.xml   |   44 ++++++++
 debian/docs/koha-restart-zebra.xml  |   44 ++++++++
 debian/docs/koha-restore.xml        |   45 ++++++++
 debian/docs/koha-start-zebra.xml    |   44 ++++++++
 debian/docs/koha-stop-zebra.xml     |   44 ++++++++
 debian/docs/koha-upgrade-schema.xml |   44 ++++++++
 debian/docs/koha-upgrade-to-3.4.xml |   41 +++++++
 20 files changed, 1058 insertions(+), 4 deletions(-)
 create mode 100644 debian/docs/koha-common.xml
 create mode 100644 debian/docs/koha-create-dirs.xml
 create mode 100644 debian/docs/koha-disable.xml
 create mode 100644 debian/docs/koha-dump-defaults.xml
 create mode 100644 debian/docs/koha-dump.xml
 create mode 100644 debian/docs/koha-email-disable.xml
 create mode 100644 debian/docs/koha-email-enable.xml
 create mode 100644 debian/docs/koha-enable.xml
 create mode 100644 debian/docs/koha-foreach.xml
 create mode 100644 debian/docs/koha-list.xml
 create mode 100644 debian/docs/koha-mysql.xml
 create mode 100644 debian/docs/koha-rebuild-zebra.xml
 create mode 100644 debian/docs/koha-reset-passwd.xml
 create mode 100644 debian/docs/koha-restart-zebra.xml
 create mode 100644 debian/docs/koha-restore.xml
 create mode 100644 debian/docs/koha-start-zebra.xml
 create mode 100644 debian/docs/koha-stop-zebra.xml
 create mode 100644 debian/docs/koha-upgrade-schema.xml
 create mode 100644 debian/docs/koha-upgrade-to-3.4.xml


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:39:54 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:39:54 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6303
	created. v3.06.00-60-g2b2e544
Message-ID: <E1RTWig-00086s-AP@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_6303 has been created
        at  2b2e544f054acc5c220dfca035554e2d13b27cdf (commit)

- Log -----------------------------------------------------------------
commit 2b2e544f054acc5c220dfca035554e2d13b27cdf
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Nov 17 12:45:47 2011 +1300

    Bug 6303: Display Organisation and Parent Organisation names when viewing a borrower of type organisation
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as advertised, doesn't affect display for non-organisational patrons.
    
    Note: Display change in OPAC only affects the summary tab.
    It would be a little bit more consistent to make the name show the
    same on all tabs in OPAC patron account.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    I repeated Katrin's signoff here (with permission). The patch only changed for some minor rebasing and cosmetic QA requests. Passed QA now.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:40:22 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:40:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-60-g2b2e544
Message-ID: <E1RTWj8-00087o-0o@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  2b2e544f054acc5c220dfca035554e2d13b27cdf (commit)
      from  5c2def51587c4b2636b5f066306b8bd5dc0e7a7a (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                                      |   22 ++++++++++---------
 circ/circulation.pl                                |    7 ++++-
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    2 +-
 .../prog/en/includes/patron-title.inc              |    6 +++++
 .../prog/en/modules/circ/circulation.tt            |   21 ++++++++++---------
 .../prog/en/modules/members/boraccount.tt          |    4 +-
 .../prog/en/modules/members/member.tt              |    4 ++-
 .../prog/en/modules/members/moremember.tt          |   10 +++++++-
 .../prog/en/modules/members/notices.tt             |    6 ++--
 .../prog/en/modules/members/readingrec.tt          |    4 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |   17 +++++++++++---
 .../opac-tmpl/prog/en/includes/patron-title.inc    |    5 ++++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    7 ++++-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    7 ++++-
 members/boraccount.pl                              |    3 +-
 members/moremember.pl                              |    6 ++--
 members/readingrec.pl                              |    1 +
 opac/opac-user.pl                                  |    2 +
 tools/viewlog.pl                                   |    3 ++
 19 files changed, 92 insertions(+), 45 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/patron-title.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:44:16 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:44:16 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7073
	created. v3.06.00-61-gf56e6c0
Message-ID: <E1RTWmu-00089X-BP@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_7073 has been created
        at  f56e6c0a58145ed3a30341bf0df85e17cde0135d (commit)

- Log -----------------------------------------------------------------
commit f56e6c0a58145ed3a30341bf0df85e17cde0135d
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Oct 20 15:54:07 2011 -0400

    Bug 7073: GetCOinSBiblio should take $record object, not biblionumber
    
    This patch changes the GetCOinsBiblio subroutine to take a MARC record object
    (as returned from GetMarcBiblio) instead of a biblionumber.  The first thing the subroutine
    did was GetMarcBiblio, and the $biblionumber passed was never used again.
    
    This subroutine was only used 3 places: opac/opac-search.pl, opac/opac-detail.pl,
    and C4/VirtualShelves/Page.pm.  In the first and last cases, it was used in a loop.
    In the last two cases, a call to GetMarcBiblio had already been done.  This is expensive, and
    we were doing it twice per record.
    
    For opac/opac-search.pl, the call to GetMarcBiblio was moved to just outside GetCOinSBiblio;
    this will not change the performance at all.  But for opac/opac-detail.pl and C4/VirtualShelves/Page.pm,
    a redudant call to GetMarcBiblio is now avoided.
    
    To Test:
    1. Enable COinSinOPACResults in system preferences.  Perform a search in the OPAC.
       Verify that the COinS spans are showing up
    2. View the detail record of one of the returned items.  Confirm that the COinS span exists on the detail page.
    3. View a list in the OPAC.  Confirm that COinS spans are still showing up
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:45:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:45:37 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-61-gf56e6c0
Message-ID: <E1RTWoD-0008BD-6u@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  f56e6c0a58145ed3a30341bf0df85e17cde0135d (commit)
      from  2b2e544f054acc5c220dfca035554e2d13b27cdf (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              |    9 +++------
 C4/VirtualShelves/Page.pm |    2 +-
 opac/opac-detail.pl       |    2 +-
 opac/opac-search.pl       |    3 ++-
 4 files changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:48:01 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:48:01 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7091
	created. v3.06.00-63-g0fd4510
Message-ID: <E1RTWqX-0008CB-8U@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_7091 has been created
        at  0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d (commit)

- Log -----------------------------------------------------------------
commit 0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Jul 15 15:04:31 2011 +1200

    Bug 7091 - [MASTER/3.6.x/3.4.x] - update the changelogs for the 3.4 series
    
    This brings all the changelog entries for releases up to what has been
    included in the packages
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 03dffd8374ee3df9836346b56d56d9bdd2e32e31
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Oct 26 15:03:36 2011 +1300

    Bug 7091 - [MASTER] - update the build version for packages from master
    
    This updates the default version number that packages are build with to
    be 3.7. This should be applied to master only.
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 11:48:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 10:48:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-63-g0fd4510
Message-ID: <E1RTWrM-0008DM-24@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  0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d (commit)
       via  03dffd8374ee3df9836346b56d56d9bdd2e32e31 (commit)
      from  f56e6c0a58145ed3a30341bf0df85e17cde0135d (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/build-git-snapshot |    2 +-
 debian/changelog          |   25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 13:45:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 12:45:23 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-64-g862b6ee
Message-ID: <E1RTYg7-0000Bp-3g@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  862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815 (commit)
      from  0fd451060eb2cd88d3f44e68dfa8da6e9ae2956d (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 862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Tue Nov 8 12:46:39 2011 +0000

    Bug 7191 Remove GetBorrowerIssues from @EXPORT
    
    No subroutine GetBorrowerIssues exists in C4::Circulation
    So don't export it into users' namespace
    
    Signed-off-by: Albert Oller <ago at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 14:12:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 13:12:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5974
	created. v3.06.00-65-gf1d4652
Message-ID: <E1RTZ5z-0000H3-BN@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_5974 has been created
        at  f1d46529f9cdbcad3fc11c6dfcbb82854a1ce64d (commit)

- Log -----------------------------------------------------------------
commit f1d46529f9cdbcad3fc11c6dfcbb82854a1ce64d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 28 14:08:00 2011 -0400

    Fix for Bug 5974 - Bogus auth check for "StaffMember" role
    
    Also removing some YAHOO.widget.Button declarations which
    are redundant.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 14:12:28 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 13:12:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-65-gf1d4652
Message-ID: <E1RTZ6K-0000Hp-HZ@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  f1d46529f9cdbcad3fc11c6dfcbb82854a1ce64d (commit)
      from  862b6ee90dfad9d00fc29bc4dc2d3cf8e0159815 (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/circ-toolbar.inc              |   30 +++----------------
 .../prog/en/includes/members-toolbar.inc           |    8 +----
 2 files changed, 7 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 14:17:50 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 13:17:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-67-g40bd14e
Message-ID: <E1RTZBW-0000Jt-Bz@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  40bd14e0ea98152377a0a416482fe0227fee17bd (commit)
       via  93d4c90a681d527044567bbbb7d5f81aec31a6b5 (commit)
      from  f1d46529f9cdbcad3fc11c6dfcbb82854a1ce64d (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 40bd14e0ea98152377a0a416482fe0227fee17bd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Nov 21 20:30:19 2011 +1300

    Bug 4330: Missing License Statement
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 93d4c90a681d527044567bbbb7d5f81aec31a6b5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Nov 21 20:26:01 2011 +1300

    Bug 4330: Wrong address for Free Software Foundation
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

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

Summary of changes:
 about.pl             |    6 +++---
 mainpage.pl          |    7 +++----
 opac/opac-export.pl  |    7 +++----
 opac/sco/sco-main.pl |   16 ++++++++++++++++
 4 files changed, 25 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 15:15:33 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 14:15:33 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7254
	created. v3.06.00-68-gfd94945
Message-ID: <E1RTa5N-0000Vi-7Q@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_7254 has been created
        at  fd949453e86b2def06b471a3b3bfa293bce78a75 (commit)

- Log -----------------------------------------------------------------
commit fd949453e86b2def06b471a3b3bfa293bce78a75
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Nov 23 13:33:26 2011 +0100

    Bug 7254 Show pending orders from baskets with closedate > 180 days
    
    Current code for selecting pending orders does not select orders from baskets
    with a closedate > 180 days.
    The code in Acquisition.pm already includes a FIXME for that.
    IMHO this part of the where clause should just be removed; an order is pending
    until it is filled. If you do not want to fill it, delete it.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Nov 24 15:39:36 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 24 Nov 2011 14:39:36 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-68-gfd94945
Message-ID: <E1RTaSe-0000eo-Ee@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  fd949453e86b2def06b471a3b3bfa293bce78a75 (commit)
      from  40bd14e0ea98152377a0a416482fe0227fee17bd (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 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 10:57:04 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 09:57:04 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6629
	created. v3.06.00-69-g9a4e9e5
Message-ID: <E1RTsWl-0003eM-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, new/bug_6629 has been created
        at  9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a (commit)

- Log -----------------------------------------------------------------
commit 9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 25 19:07:28 2011 +1300

    Bug 6629 : Sanitizing input from language cookie
    
    I dont think we can use only 2 digits, some languages is much longer
    zh-hans-TW for example
    
    But the regex should stop it bening able handle nasty chars,
    whitelisting safe ones instead
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I checked the patch doesn't break language switching and language selection.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    I confirm the bug security issue was not here for master, but this fix improve the behaviour, so pushing it

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 11:04:49 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 10:04:49 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-69-g9a4e9e5
Message-ID: <E1RTseH-0003fu-Fn@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  9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a (commit)
      from  fd949453e86b2def06b471a3b3bfa293bce78a75 (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/Templates.pm |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 11:07:37 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 10:07:37 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_3388
	created. v3.06.00-65-g573b927
Message-ID: <E1RTsgz-0003gz-Sm@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_3388 has been created
        at  573b9275a6ab3fa1c0b24ce202ab69c44238b963 (commit)

- Log -----------------------------------------------------------------
commit 573b9275a6ab3fa1c0b24ce202ab69c44238b963
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Oct 28 17:33:31 2011 +0200

    Bug 3388: Restore account number on vendor page
    
    This patch makes it possible to add the account number to the
    vendor information. The used field aqbookseller.accountnumber was
    already existent in the database.
    
    To test:
    1) Add a new vendor with accountnumber
    > Verify form has a field for accountnumber
    > Verify accountnumber does show up on vendor summary page
    2) Edit this vendor, change accountnumber
    > Verify change was correctly saved and new number is displayed on
    vendor summary page
    3) Delete accountnumber
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Tested 1-3, no troubles found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 11:43:34 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 10:43:34 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-71-gc0e1984
Message-ID: <E1RTtFm-0003me-62@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  c0e198498199475e4c9bd62eee21f8aed2fa2033 (commit)
       via  573b9275a6ab3fa1c0b24ce202ab69c44238b963 (commit)
      from  9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a (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 c0e198498199475e4c9bd62eee21f8aed2fa2033
Merge: 9a4e9e5 573b927
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 25 11:43:04 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_3388'

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

Summary of changes:
 C4/Bookseller.pm                                   |   15 +++++++++------
 acqui/supplier.pl                                  |    2 ++
 acqui/updatesupplier.pl                            |    1 +
 .../prog/en/modules/acqui/supplier.tt              |   11 ++++++++---
 4 files changed, 20 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 13:59:06 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 12:59:06 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_5974
	updated. v3.06.00-66-geefa614
Message-ID: <E1RTvMw-00047C-Fu@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_5974 has been updated
       via  eefa6147a2ffd8afba153d51683792798006aa69 (commit)
      from  f1d46529f9cdbcad3fc11c6dfcbb82854a1ce64d (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 eefa6147a2ffd8afba153d51683792798006aa69
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 25 13:58:48 2011 +0100

    follow-up: trailing " that makes T::T fail

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

Summary of changes:
 .../prog/en/includes/circ-toolbar.inc              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 13:59:31 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 12:59:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-73-ged9e0bf
Message-ID: <E1RTvNL-000484-FG@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  ed9e0bf41e59a45a4f6d376ec71e5c03c35ab3cc (commit)
       via  eefa6147a2ffd8afba153d51683792798006aa69 (commit)
      from  c0e198498199475e4c9bd62eee21f8aed2fa2033 (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 ed9e0bf41e59a45a4f6d376ec71e5c03c35ab3cc
Merge: c0e1984 eefa614
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 25 13:59:25 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_5974'

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

Summary of changes:
 .../prog/en/includes/circ-toolbar.inc              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:09:35 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:09:35 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6328
	created. v3.06.00-77-g1f6ae97
Message-ID: <E1RTvX5-0004Bv-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, new/bug_6328 has been created
        at  1f6ae97375038d222d9cfb2ced42188250bee460 (commit)

- Log -----------------------------------------------------------------
commit 1f6ae97375038d222d9cfb2ced42188250bee460
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 25 14:09:06 2011 +0100

    bug 6328: updatedatabase bump

commit d019b4c63aa46f5eaad044178b5489aee0491ab1
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Oct 21 17:23:36 2011 +0200

    Bug 6328 Fixes for comment 35
    
    * correctly indenting with tab the debarrcomment field
    * setdebar.pl is called without status parameter, thus it is not working anymore. It's fixed & some dead code has been removed. To test : debar someone, then go to patron detail page and click "lift debarment"
    * the test function had not been updated. The fix define a debarment date of 2099-12-31 (no limit)

commit 41b42dbe32245d7ca483906507fd5021e499d46a
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Oct 11 18:22:27 2011 +0200

    Bug 6328 follow-up for QA comments
    
    * fixed documentation in C4/Auth_with_ldap.pm
    * updated ILSDI/Utility.pm to work with debarred being a date
    * updated Members.pm/patronflags to work with debarred being a date (copy/paste of BibLibre code that had not been backported)
    * fixed opac-reserve to check correctly for debarred status
    
    I also have removed a duplicate line on circulation.pl when the patron was restricted = the information was displayed twice

commit 1fe3514c3cca5ae73b370411150112bf2647c63d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed May 11 16:54:56 2011 +0200

    Bug 6328 fine in days does not work
    
    Some code coming from BibLibre has been lost in the process of inclusion in
    3.4. The result is that fine in days does not work at all (you can setup rules,
    but it does nothing)
    
    Step to reproduce:
    
    - Koha > Admin > circ rules > set 1 day fine every day of overdue for default
      rule
    - Issue a book return date last week
    - check-in the book => no debarment is set
    
    The following patch will fix all of those problems by :
    
    * updating borrowers.debarred to a date field (instead of tinyint). It contains
      the limit of the debarment
    * changing API of DebarMember and UpdateBorrowerDebarred to pass a date
    * display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is
      considered as unlimited and not displayed
    * added a debarrcomment, usefull to explain why a patron is debarred (this is
      independant from debarrdate changes and can be used when placing an unlimited
      debarment too)
    
    [2011-05-12] F. Demians. It works as described. And I can confirm this
    functionality is impatiently awaited by French libraries since one year. Thanks
    BibLibre for the good work and for contributing this code.
    
    Bug 6328 Followup--update DB structure
    
    Thanks Katrin.
    
    Bug 6328: make comment a textbox / fix debar by notice trigger
    
    Debarring by notice triggers was broken, because the new function
    expects a date as second parameter.
    
    The comment field in patron account details was a very long text field.
    Patch changes it to be a textbox instead.
    
    Bug 6328: Lift debarment leaves patron account
    
    'Lift debarment' redirects to an empty circulation page.
    
    BZ6328 follow-up 3
    
    Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed
    he still could not check-out.
    
    The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere
    The sub was still checking for old_issues instead of calling CheckBorrowerDebarred
    to get a debardate if applicable
    
    Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch.
    Seemed to work if you had only default rules. That's probably why it hadn't been spotted before
    
    BZ6328 follow-up 4
    Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on
    installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl
    
    Signed-off-by: koha <koha at kohabase.localdomain>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:10:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:10:03 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-77-g1f6ae97
Message-ID: <E1RTvXW-0004Ck-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  1f6ae97375038d222d9cfb2ced42188250bee460 (commit)
       via  d019b4c63aa46f5eaad044178b5489aee0491ab1 (commit)
       via  41b42dbe32245d7ca483906507fd5021e499d46a (commit)
       via  1fe3514c3cca5ae73b370411150112bf2647c63d (commit)
      from  ed9e0bf41e59a45a4f6d376ec71e5c03c35ab3cc (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_with_ldap.pm                               |    3 +-
 C4/Circulation.pm                                  |   60 ++++++++++++++++++
 C4/ILSDI/Utility.pm                                |    2 +-
 C4/Members.pm                                      |   66 +++++++-------------
 C4/Overdues.pm                                     |   23 ++++---
 circ/circulation.pl                                |   11 +++
 circ/returns.pl                                    |    7 ++-
 installer/data/mysql/kohastructure.sql             |    6 +-
 installer/data/mysql/updatedatabase.pl             |   15 +++++
 .../prog/en/modules/circ/circulation.tt            |   13 +++-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 +
 .../prog/en/modules/members/memberentrygen.tt      |   35 ++++++++++-
 .../prog/en/modules/members/moremember.tt          |    7 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |    2 +-
 kohaversion.pl                                     |    2 +-
 members/memberentry.pl                             |   19 +++++-
 members/moremember.pl                              |   12 +++-
 members/setdebar.pl                                |   18 ++----
 members/setstatus.pl                               |    4 +-
 misc/cronjobs/overdue_notices.pl                   |    2 +-
 opac/opac-reserve.pl                               |    3 +-
 opac/opac-user.pl                                  |    1 +
 t/db_dependent/lib/KohaTest/Members/DebarMember.pm |    2 +-
 23 files changed, 224 insertions(+), 92 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:18:52 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:18:52 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6877
	created. v3.06.00-78-g4f49dc5
Message-ID: <E1RTvg4-0004FH-BJ@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_6877 has been created
        at  4f49dc5ad05289820916c6fd879e70f3adeee253 (commit)

- Log -----------------------------------------------------------------
commit 4f49dc5ad05289820916c6fd879e70f3adeee253
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Sat Sep 17 12:45:09 2011 +0100

    Bug 6877 - use is executed and errors at compile time
    
    Although use is being called in an eval it will still be executed
    at compile time so that an error can cause the script to abort before
    the eval is executed. The eval expression syntax is not checked
    so eval block should be preferred.
    Use require/import which execute at runtime which is the intention
    here.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    checked that, with Libravatar OK things are still OK

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:19:14 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:19:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-78-g4f49dc5
Message-ID: <E1RTvgQ-0004G3-BK@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  4f49dc5ad05289820916c6fd879e70f3adeee253 (commit)
      from  1f6ae97375038d222d9cfb2ced42188250bee460 (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-detail.pl      |   11 ++++++++---
 opac/opac-showreviews.pl |   11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:26:48 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:26:48 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7250
	created. v3.06.00-78-g1b49f54
Message-ID: <E1RTvnk-0004IQ-N9@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_7250 has been created
        at  1b49f54b8828c7ee4ecba8856886f9662d9712d8 (commit)

- Log -----------------------------------------------------------------
commit 1b49f54b8828c7ee4ecba8856886f9662d9712d8
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Nov 21 07:54:15 2011 +0100

    Bug 7250: stage_biblios_file.pl is missing options for encoding
    
    - adds command line options for encoding, defaulting to utf8
    - options match options availablen in the stage marc records form
      of the staff interface
    - activates warnings
    - adds copyright statement
    
    To test:
    Import records with diacritics using the stage_biblios_file.pl
    Records can be imported into the catalog using the staff interface
    or the commit_biblios_file.pl script.
    
    Signed-off-by: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
    
    Successfully tested with default encoding utf8.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Nov 25 14:29:10 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 25 Nov 2011 13:29:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-80-g6323bb0
Message-ID: <E1RTvq2-0004JS-1q@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  6323bb081e353029bef8f6a28244b228915dbd43 (commit)
       via  1b49f54b8828c7ee4ecba8856886f9662d9712d8 (commit)
      from  4f49dc5ad05289820916c6fd879e70f3adeee253 (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 6323bb081e353029bef8f6a28244b228915dbd43
Merge: 4f49dc5 1b49f54
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Nov 25 14:29:04 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_7250'

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

Summary of changes:
 misc/stage_biblios_file.pl |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 09:46:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 08:46:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6629
	updated. v3.06.00-71-gaf205cb
Message-ID: <E1RUwql-0002RH-4A@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_6629 has been updated
       via  af205cb50af430b743fccd84475be15ce14fc84e (commit)
       via  948f65344eb92aa6940ec02b575d6609d1af83f5 (commit)
      from  9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a (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 af205cb50af430b743fccd84475be15ce14fc84e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 27 21:58:04 2011 +1300

    Bug 6629 : Follow up, sanitising in a couple more places
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

commit 948f65344eb92aa6940ec02b575d6609d1af83f5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 27 21:18:29 2011 +1300

    Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch fixes problem occuring in web installer.

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

Summary of changes:
 installer/InstallAuth.pm |   18 ++++++++++--------
 installer/install.pl     |    2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 09:46:32 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 08:46:32 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-83-g2989e12
Message-ID: <E1RUwrA-0002S8-Bz@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  2989e12288b09745863376d10d830af5687e7e5e (commit)
       via  af205cb50af430b743fccd84475be15ce14fc84e (commit)
       via  948f65344eb92aa6940ec02b575d6609d1af83f5 (commit)
      from  6323bb081e353029bef8f6a28244b228915dbd43 (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 2989e12288b09745863376d10d830af5687e7e5e
Merge: 6323bb0 af205cb
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon Nov 28 09:46:23 2011 +0100

    Merge branch 'new/bug_6629'

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

Summary of changes:
 installer/InstallAuth.pm |   18 ++++++++++--------
 installer/install.pl     |    2 ++
 2 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 10:07:08 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 09:07:08 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6628
	created. v3.06.00-84-g8664d19
Message-ID: <E1RUxB6-0002Y5-1l@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_6628 has been created
        at  8664d195671c1a65af7b205b14099c1581c0500b (commit)

- Log -----------------------------------------------------------------
commit 8664d195671c1a65af7b205b14099c1581c0500b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Nov 26 07:39:51 2011 +1300

    Bug 6628 : Stopping a potential vulnerability
    
    Signed-off-by: Fr?re S?bastien Marie <semarie-koha at latrappe.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - verified help pages still work
    - verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
    show the template file (did work on master, not after applying patch)
    - verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 10:09:40 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 09:09:40 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-84-g8664d19
Message-ID: <E1RUxDX-0002Ys-Uj@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  8664d195671c1a65af7b205b14099c1581c0500b (commit)
      from  2989e12288b09745863376d10d830af5687e7e5e (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:
 help.pl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 10:12:07 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 09:12:07 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6328
	updated. v3.06.00-78-g3e05393
Message-ID: <E1RUxFv-0002a4-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_6328 has been updated
       via  3e05393dd8160c754c2ef027315038c6dc8b6b9b (commit)
      from  1f6ae97375038d222d9cfb2ced42188250bee460 (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 3e05393dd8160c754c2ef027315038c6dc8b6b9b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 27 20:30:49 2011 +1300

    Bug 6328 : Previous patches broke templates, this is fixing them
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixes xt/tt_valid.t
    Checked the member entry page, didn't find any problems.

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

Summary of changes:
 .../prog/en/modules/members/memberentrygen.tt      |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 10:12:30 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 09:12:30 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-86-g339e9ed
Message-ID: <E1RUxGI-0002av-6Y@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  339e9edd146073a6957473cb4b10c582454ab8c4 (commit)
       via  3e05393dd8160c754c2ef027315038c6dc8b6b9b (commit)
      from  8664d195671c1a65af7b205b14099c1581c0500b (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 339e9edd146073a6957473cb4b10c582454ab8c4
Merge: 8664d19 3e05393
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon Nov 28 10:12:23 2011 +0100

    Merge branch 'new/bug_6328'

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

Summary of changes:
 .../prog/en/modules/members/memberentrygen.tt      |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 12:14:03 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 11:14:03 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_7268
	created. v3.06.00-88-gc95cbce
Message-ID: <E1RUz9v-000363-3B@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_7268 has been created
        at  c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57 (commit)

- Log -----------------------------------------------------------------
commit c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon Nov 28 12:13:42 2011 +0100

    fixing the translatable-template.t to handle localized setups
    
    Depending on your locale, msgmerge will return a different messages, enclosed in .... and .
    The flow is not utf8 compliant, so this patch switches to testing "..... anything." instead of ".... word."
    
    Now the test work on my (french setup)

commit 66fa8288461c8f14108a507de91977b3394d1c0c
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Nov 7 15:30:20 2011 +1300

    Bug 7268: Fixing failing tests for translatable templates
    
    To test run
    
    perl xt/author/translatable-templates.t
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Test runs without any complaints about the fixed templates now.
    Also checked detail pages without XSLT turned on display correctly.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 12:14:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 11:14:21 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-88-gc95cbce
Message-ID: <E1RUzAD-00036p-IX@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  c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57 (commit)
       via  66fa8288461c8f14108a507de91977b3394d1c0c (commit)
      from  339e9edd146073a6957473cb4b10c582454ab8c4 (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/catalogue/detail.tt            |    4 ++--
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |    2 +-
 xt/author/translatable-templates.t                 |    7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 12:20:44 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 11:20:44 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6894
	created. v3.06.00-69-g624b156
Message-ID: <E1RUzGO-00039T-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, new/bug_6894 has been created
        at  624b1562d8567dabd23cb4e1ac7e34615e604edc (commit)

- Log -----------------------------------------------------------------
commit 624b1562d8567dabd23cb4e1ac7e34615e604edc
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Oct 25 17:38:04 2011 +0200

    Bug 6894: Order from suggestion defaulting to wrong currency
    
    This problem turned out to be a bit different, than I initally thought.
    
    This patch fixes the currency selections for new orders created in staff.
    Before this patch, the first currency in the list was selected instead
    of the active currency. So you needed to change it explicitly.
    
    After patch it should work like this:
    
    1) Suggestion created in OPAC - currency defaults to NULL in database
    2) Editing a suggestion created in OPAC will default to active currency.
    3) Creating a new suggestion in staff will default to active currency.
    4) When ordering, the currency will default to the vendor currency, if no
    currency is set in the suggestion. (still happens, when suggestions are accepted
    in batch from the list.
    
    I hope this is right - comments and testing appreciated.
    
    Signed-off-by: Liz Rea <lrea at nekls.org>
    Verified that in the above places, active currency was displayed or selected. Tested both suggestions entered from the OPAC and from the intranet.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Verified the existence of the bug, and that the fix works as advertised.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Nov 28 12:21:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 28 Nov 2011 11:21:24 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-90-gf048976
Message-ID: <E1RUzH2-0003AF-PM@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  f0489763d66dde3309396755f7c1d0c6359be31b (commit)
       via  624b1562d8567dabd23cb4e1ac7e34615e604edc (commit)
      from  c95cbce4ce8df9d9d8f664b84a3d15a6e8e8cc57 (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 f0489763d66dde3309396755f7c1d0c6359be31b
Merge: c95cbce 624b156
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon Nov 28 12:20:58 2011 +0100

    Merge remote-tracking branch 'origin/new/bug_6894'

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

Summary of changes:
 suggestion/suggestion.pl |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Nov 29 02:30:39 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 29 Nov 2011 01:30:39 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.00-54-gab04c8f
Message-ID: <E1RVCWt-0007h3-Rq@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.6.x has been updated
       via  ab04c8f27aab9cd30649e01bc9ba4859c9b07bfd (commit)
       via  9c816a2fd4298f49b322562380215816a8d41671 (commit)
       via  4b22534bd0f2b9ddd079307a9c482a6653de41c4 (commit)
       via  218cc183ea2fdb9396498b05d5145d393c444000 (commit)
       via  c63f4a3684897f5ad7c97a72727cc5c106a088f3 (commit)
       via  da171ec31c6cc805ae8efdcb72cd13ea43766e1b (commit)
      from  16189ed8c37960a76d80899004654e617d98bcde (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 ab04c8f27aab9cd30649e01bc9ba4859c9b07bfd
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Mon Nov 28 20:20:19 2011 -0500

    Release Notes for 3.06.01.000

commit 9c816a2fd4298f49b322562380215816a8d41671
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Mon Nov 28 20:16:18 2011 -0500

    Updating Version Number to 3.06.01.000

commit 4b22534bd0f2b9ddd079307a9c482a6653de41c4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Nov 26 07:39:51 2011 +1300

    Bug 6628 : Stopping a potential vulnerability
    
    Signed-off-by: Fr?re S?bastien Marie <semarie-koha at latrappe.fr>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    - verified help pages still work
    - verified /cgi-bin/koha/help.pl?url=koha/../catalogue/advsearch.pl does not
    show the template file (did work on master, not after applying patch)
    - verified cgi-bin/koha/help.pl?url=koha/../../../../../../etc/passwd%00.pl does not work (didn't work on master or after applying patch)
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    The potential vulnerability would allow anyone to see the content of any .tt file, and .tt only. Was much less critical than the vulnerability for 6629, but it's worth fixing !
    (cherry picked from commit 8664d195671c1a65af7b205b14099c1581c0500b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 218cc183ea2fdb9396498b05d5145d393c444000
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 27 21:58:04 2011 +1300

    Bug 6629 : Follow up, sanitising in a couple more places
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit af205cb50af430b743fccd84475be15ce14fc84e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c63f4a3684897f5ad7c97a72727cc5c106a088f3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Nov 27 21:18:29 2011 +1300

    Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch fixes problem occuring in web installer.
    (cherry picked from commit 948f65344eb92aa6940ec02b575d6609d1af83f5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit da171ec31c6cc805ae8efdcb72cd13ea43766e1b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Fri Nov 25 19:07:28 2011 +1300

    Bug 6629 : Sanitizing input from language cookie
    
    I dont think we can use only 2 digits, some languages is much longer
    zh-hans-TW for example
    
    But the regex should stop it bening able handle nasty chars,
    whitelisting safe ones instead
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I checked the patch doesn't break language switching and language selection.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    I confirm the bug security issue was not here for master, but this fix improve the behaviour, so pushing it
    (cherry picked from commit 9a4e9e54f26b0c1bf69c5be1f5b0fea93134c06a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Templates.pm                            |    6 +-
 help.pl                                    |    4 +-
 installer/InstallAuth.pm                   |   18 ++-
 installer/data/mysql/updatedatabase.pl     |    6 +
 installer/install.pl                       |    2 +
 kohaversion.pl                             |    2 +-
 misc/release_notes/release_notes_3_6_1.txt |  192 ++++++++++++++++++++++++++++
 7 files changed, 216 insertions(+), 14 deletions(-)
 create mode 100644 misc/release_notes/release_notes_3_6_1.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Nov 29 02:32:43 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 29 Nov 2011 01:32:43 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.06.01
	created. v3.06.01
Message-ID: <E1RVCYt-0007ik-Km@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.01 has been created
        at  7ea98159535bf9214659df61f5ce4054658f5a88 (tag)
   tagging  ab04c8f27aab9cd30649e01bc9ba4859c9b07bfd (commit)
  replaces  v3.06.00
 tagged by  Chris Nighswonger
        on  Mon Nov 28 20:23:26 2011 -0500

- Log -----------------------------------------------------------------
v3.06.01
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEcBAABAgAGBQJO1DQgAAoJEEQBPavVIgJhDa4H/ilQBm5Vg2LXr6vodqBF7tSZ
Aj78iRLrmuYAoT4+GUQVUXvF7v0f6mOo8yYcYQh6mRm4+r0Elm44tweVQZa7x5XL
Wap7xUvDIlbNzjBn8Z3Y8v24BY/ybY8NNDHNaHUeXuIIIL1/JF8jv+Av6UtzieOF
O1AtbUWArxFoZfpqJ1IKuGPlVaM4x9sau2NRHH4PyVMqJb0bhQe3uPUptNKF+tI+
ParU3n/LchXLtfjNJqs/DW9dQ/fMk/1LzOuy/GXPnS2AI8cb28cmTMQawiXhVDn8
02IRL56KGKH3iEqREXfBKQclLGsJwAgIRSvAr09b27HpYYBa9TnsqG4ShLc9qXU=
=IgnB
-----END PGP SIGNATURE-----

Chris Cormack (12):
      Sorry pushed this by mistake when trying to fix Pauls permissions
      Bug 6895 : First attempt at fixing the diacritics bug
      Bug 6679 : Declare variables outside of conditionals
      Bug 6679 : Don't declare variables in conditionals Don't change $_ in a list context http://search.cpan.org/~elliotjs/Perl-Critic-1.116/lib/Perl/Critic/Policy/ControlStructures/ProhibitMutatingListFunctions.pm
      Bug 6679 : Not using strict .. bad script, no cookie for you!
      Bug 6679 : Don't declare variables in conditionals
      Bug 6679 : Tidying changed parts of file
      Bug 6679: Fixing admin/aqplain :encoding(UTF-8) gives strict validation
      Bug 6629 : Sanitizing input from language cookie
      Bug 6629 : Follow up to trap vuln in webinstaller and fixing the error
      Bug 6629 : Follow up, sanitising in a couple more places
      Bug 6628 : Stopping a potential vulnerability

Chris Nighswonger (4):
      Bug 7207 - Reverting a portion of commit 607b5449bd5cb which breaks the label export script.
      Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
      Updating Version Number to 3.06.01.000
      Release Notes for 3.06.01.000

Fr?d?ric Demians (2):
      Bug 6989 Patron categories not properly displayed if not pure ASCII
      Bug 6799 rebuild_zebra.pl -x produces invalid XML records

Fr?d?rick Capovilla (5):
      Bug 6963: Corrects a problem when a new order is created with a duplicate barcode.
      Follow-up patch : use the subfield associated with items.barcode
      Notify the user on his account page when his account is almost expired
      Make all strings translatable in marc21_field_007.tt
      Bug 6977: Follow-up patch : catch CloneSubfield errors

Ian Walls (7):
      Bug 7076: Lists render OPAC XSLT on staff side
      Bug 7061: unnecessary global variables declared in C4::SQLHelper
      Bug 6471: add tablesorter to Holds Queue
      Bug 6390 Followup: Basket's authorisedby might not be a borrowernumber
      Bug 5945: email not searchable in patron search
      Bug 2629: Add diacritic support for ? (U with ring)
      Bug 7134: patron records getting corrupted birthdates

Joy Nelson (1):
      Bug 7221: C4/Biblio.pm documentation is incorrect.

Julian Maurice (1):
      Bug 7185: Fix updatedatabase message for 3.6.0 release

Katrin Fischer (4):
      Bug 7117: Bug 7117 - Small display problems when organising suggestion tabs by name
      Bug 6994: Wrong 'no budget defined' alert
      Bug 7138: Can't print basket group order pdf
      Bug 4161: Preselect active currency for new vendors

Liz Rea (2):
      Bug 7128 - adding some ID's to make styling opac-main.tt a bit easier
      Bug 7084 - Re-arranging results_summary for tags so that it applies where it is supposed to

Marcel de Rooy (1):
      7146 (Update timestamps when deleting a biblio)

Maxime Pelletier (2):
      Use unitprice in neworder so that the value is saved in the database and so it will be the same field used as to receive shipments
      Bug 7069: Put strings in "" instead of '' to fix the javascript not working when the translated string has a ' in it.

Nahuel ANGELINETTI (1):
      (bug #4518) enhance 2.2 to 3.0 scripts

Owen Leonard (6):
      Fix for Bug 5974 - Bogus auth check for "StaffMember" role
      Fix for Bug 6955, Toolbar on reading history broken
      Follow-up fix for Bug 3958, Standardize vendor/supplier/bookseller terminology
      Fix for Bug 7085 - Problems with searching for orders in acquisitions
      Follow-up fix for Bug 5150 - Issuing should read Circulation
      Incremental fix for Bug 2847, Use HTML escape in templates where appropriate

Paul Poulain (5):
      Bug 5885 : UNIMARC XSLT changes
      Bug 7184 raise mySQL error if debug is set
      Bug 7188: C4::Context::db_scheme2dbi does case-insensitive grep
      updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th
      Joy nelson was already in history.txt, removing the entry

Salvador Zaragoza Rubio (1):
      Bug 6475 - Edit it's not possible in subfield "0" in MARC framework

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Nov 29 03:38:00 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 29 Nov 2011 02:38:00 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.01-1-g9237ad0
Message-ID: <E1RVDa4-0008OO-9i@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.6.x has been updated
       via  9237ad075d9cf1acaeb5e96ec29eb2a917284372 (commit)
      from  ab04c8f27aab9cd30649e01bc9ba4859c9b07bfd (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 9237ad075d9cf1acaeb5e96ec29eb2a917284372
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Mon Nov 28 21:37:44 2011 -0500

    Release Notes for 3.06.01.000

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

Summary of changes:
 misc/release_notes/release_notes_3_6_1.txt |   32 +++++++++++++++------------
 1 files changed, 18 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 30 03:06:23 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 30 Nov 2011 02:06:23 +0000
Subject: [koha-commits] main Koha release repository branch 3.6.x updated.
	v3.06.01-2-g34df64b
Message-ID: <E1RVZZ1-0006Wn-E2@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.6.x has been updated
       via  34df64b03f4c2eabc8303676d59d8b2dcea67db6 (commit)
      from  9237ad075d9cf1acaeb5e96ec29eb2a917284372 (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 34df64b03f4c2eabc8303676d59d8b2dcea67db6
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Nov 28 18:58:34 2011 +0100

    3.6.1 Translation Update
    (cherry picked from commit d3c1927a0763adc8aa54e211e9289c386c8c8e9f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 .../po/am-Ethi-i-opac-t-prog-v-3006000.po          | 2221 +-
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         | 7261 ++-
 misc/translator/po/am-Ethi-pref.po                 |   96 +
 .../po/ar-Arab-i-opac-t-prog-v-3006000.po          | 2227 +-
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         | 7676 ++-
 misc/translator/po/ar-Arab-pref.po                 |   96 +
 .../translator/po/az-AZ-i-opac-t-prog-v-3006000.po | 2232 +-
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           | 7696 ++-
 misc/translator/po/az-AZ-pref.po                   |   96 +
 misc/translator/po/ben-i-opac-t-prog-v-3006000.po  | 2291 +-
 misc/translator/po/ben-i-staff-t-prog-v-3006000.po | 7261 ++-
 misc/translator/po/ben-pref.po                     |   96 +
 .../translator/po/ca-VA-i-opac-t-prog-v-3006000.po | 2227 +-
 .../po/ca-VA-i-staff-t-prog-v-3006000.po           | 7261 ++-
 misc/translator/po/ca-VA-pref.po                   |   96 +
 .../translator/po/da-DK-i-opac-t-prog-v-3006000.po | 2366 +-
 .../po/da-DK-i-staff-t-prog-v-3006000.po           | 8918 ++-
 misc/translator/po/da-DK-pref.po                   |  151 +-
 .../translator/po/de-DE-i-opac-t-prog-v-3006000.po | 9268 ++--
 .../po/de-DE-i-staff-t-prog-v-3006000.po           |62751 +++++++++++---------
 misc/translator/po/de-DE-pref.po                   |    2 +-
 .../translator/po/el-GR-i-opac-t-prog-v-3006000.po | 2940 +-
 .../po/el-GR-i-staff-t-prog-v-3006000.po           | 8593 ++-
 misc/translator/po/el-GR-pref.po                   |   96 +
 .../translator/po/en-GB-i-opac-t-prog-v-3006000.po | 2285 +-
 .../po/en-GB-i-staff-t-prog-v-3006000.po           | 7740 ++-
 misc/translator/po/en-GB-pref.po                   |  141 +-
 .../translator/po/en-NZ-i-opac-t-prog-v-3006000.po | 4255 +-
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           | 9130 +++-
 misc/translator/po/en-NZ-pref.po                   |   96 +
 .../translator/po/es-ES-i-opac-t-prog-v-3006000.po | 2425 +-
 .../po/es-ES-i-staff-t-prog-v-3006000.po           | 8001 ++-
 misc/translator/po/es-ES-pref.po                   |  233 +-
 misc/translator/po/eu-i-opac-t-prog-v-3006000.po   | 2209 +-
 misc/translator/po/eu-pref.po                      |   96 +
 .../translator/po/fi-FI-i-opac-t-prog-v-3006000.po | 2380 +-
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           | 7285 ++-
 misc/translator/po/fi-FI-pref.po                   |   96 +
 .../translator/po/fr-CA-i-opac-t-prog-v-3006000.po | 7095 ++--
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           |30993 ++++++-----
 misc/translator/po/fr-CA-pref.po                   | 1942 +-
 .../translator/po/fr-FR-i-opac-t-prog-v-3006000.po | 2332 +-
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           | 8476 ++-
 misc/translator/po/fr-FR-pref.po                   |  116 +-
 misc/translator/po/hi-i-opac-t-prog-v-3006000.po   | 2227 +-
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  | 7781 ++-
 misc/translator/po/hi-pref.po                      |   96 +
 .../translator/po/hr-HR-i-opac-t-prog-v-3006000.po | 2715 +-
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           | 7344 ++-
 misc/translator/po/hr-HR-pref.po                   |   96 +
 .../translator/po/hu-HU-i-opac-t-prog-v-3006000.po | 2243 +-
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           | 7513 ++-
 misc/translator/po/hu-HU-pref.po                   |   96 +
 .../po/hy-Armn-i-opac-t-prog-v-3006000.po          | 2244 +-
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         | 7741 ++-
 misc/translator/po/hy-Armn-pref.po                 |   96 +
 .../translator/po/id-ID-i-opac-t-prog-v-3006000.po | 2209 +-
 .../po/id-ID-i-staff-t-prog-v-3006000.po           | 7261 ++-
 misc/translator/po/id-ID-pref.po                   |   96 +
 .../translator/po/is-IS-i-opac-t-prog-v-3006000.po | 2233 +-
 misc/translator/po/is-IS-pref.po                   |   96 +
 .../translator/po/it-IT-i-opac-t-prog-v-3006000.po | 2790 +-
 .../po/it-IT-i-staff-t-prog-v-3006000.po           | 8428 ++-
 misc/translator/po/it-IT-pref.po                   |  131 +-
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po       | 2228 +-
 misc/translator/po/ja-Jpan-JP-pref.po              |   96 +
 .../po/lo-Laoo-i-opac-t-prog-v-3006000.po          | 5377 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         | 7261 ++-
 misc/translator/po/lo-Laoo-pref.po                 |   96 +
 .../translator/po/mi-NZ-i-opac-t-prog-v-3006000.po | 2225 +-
 misc/translator/po/mi-NZ-pref.po                   |   96 +
 misc/translator/po/mon-i-opac-t-prog-v-3006000.po  | 2225 +-
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po | 7612 ++-
 misc/translator/po/mon-pref.po                     |   96 +
 misc/translator/po/mr-i-opac-t-prog-v-3006000.po   | 4966 +-
 misc/translator/po/mr-i-staff-t-prog-v-3006000.po  |28095 +++++----
 misc/translator/po/mr-pref.po                      |32034 +----------
 .../translator/po/ms-MY-i-opac-t-prog-v-3006000.po | 2328 +-
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           | 7271 ++-
 misc/translator/po/ms-MY-pref.po                   |   96 +
 .../translator/po/nb-NO-i-opac-t-prog-v-3006000.po | 2370 +-
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           |15816 +++--
 misc/translator/po/nb-NO-pref.po                   |   96 +
 .../translator/po/nl-BE-i-opac-t-prog-v-3006000.po | 2699 +-
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           | 8626 ++-
 misc/translator/po/nl-BE-pref.po                   | 1345 +-
 .../translator/po/nl-NL-i-opac-t-prog-v-3006000.po | 2233 +-
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           | 7261 ++-
 misc/translator/po/nl-NL-pref.po                   |   96 +
 .../translator/po/nn-NO-i-opac-t-prog-v-3006000.po | 2232 +-
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           | 7618 ++-
 misc/translator/po/nn-NO-pref.po                   |   96 +
 .../translator/po/pl-PL-i-opac-t-prog-v-3006000.po | 2377 +-
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           | 7711 ++-
 misc/translator/po/pl-PL-pref.po                   |   96 +
 .../translator/po/pt-BR-i-opac-t-prog-v-3006000.po | 2440 +-
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           | 7912 ++-
 misc/translator/po/pt-BR-pref.po                   |  173 +-
 .../translator/po/pt-PT-i-opac-t-prog-v-3006000.po | 2237 +-
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           | 7795 ++-
 misc/translator/po/pt-PT-pref.po                   |  106 +-
 .../translator/po/ro-RO-i-opac-t-prog-v-3006000.po | 2235 +-
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           | 7492 ++-
 misc/translator/po/ro-RO-pref.po                   |   96 +
 .../translator/po/ru-RU-i-opac-t-prog-v-3006000.po | 3147 +-
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           | 9347 +++-
 misc/translator/po/ru-RU-pref.po                   |  176 +-
 .../translator/po/sd-PK-i-opac-t-prog-v-3006000.po | 2212 +-
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           | 7261 ++-
 misc/translator/po/sd-PK-pref.po                   |   96 +
 .../translator/po/sv-SE-i-opac-t-prog-v-3006000.po | 2233 +-
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           | 7288 ++-
 misc/translator/po/sv-SE-pref.po                   |   96 +
 misc/translator/po/tet-i-opac-t-prog-v-3006000.po  | 2947 +-
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po |12321 +++--
 misc/translator/po/tet-pref.po                     |  100 +-
 .../po/th-THA-i-opac-t-prog-v-3006000.po           | 2256 +-
 .../po/th-THA-i-staff-t-prog-v-3006000.po          | 7261 ++-
 misc/translator/po/th-THA-pref.po                  |   96 +
 .../translator/po/tr-TR-i-opac-t-prog-v-3006000.po | 2236 +-
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           | 7697 ++-
 misc/translator/po/tr-TR-pref.po                   |   96 +
 .../translator/po/uk-UA-i-opac-t-prog-v-3006000.po | 3171 +-
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           | 9412 +++-
 misc/translator/po/uk-UA-pref.po                   |  178 +-
 .../po/ur-Arab-i-opac-t-prog-v-3006000.po          | 2215 +-
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         | 7261 ++-
 misc/translator/po/ur-Arab-pref.po                 |   96 +
 .../po/zh-Hans-CN-i-opac-t-prog-v-3006000.po       | 2225 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      | 7700 ++-
 misc/translator/po/zh-Hans-CN-pref.po              |   96 +
 .../po/zh-Hans-TW-i-opac-t-prog-v-3006000.po       | 2250 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      | 7687 ++-
 misc/translator/po/zh-Hans-TW-pref.po              |   96 +
 134 files changed, 378101 insertions(+), 229092 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 30 17:07:21 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 30 Nov 2011 16:07:21 +0000
Subject: [koha-commits] main Koha release repository branch new/bug_6328
	updated. v3.06.00-79-g384b917
Message-ID: <E1RVmgr-0000sj-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_6328 has been updated
       via  384b9179e0ee916d7bec59dbb86cdee7d2ce0177 (commit)
      from  3e05393dd8160c754c2ef027315038c6dc8b6b9b (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 384b9179e0ee916d7bec59dbb86cdee7d2ce0177
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Nov 30 14:53:48 2011 +0100

    Bug 7272 setting NULL to debarred field, to avoid having 0000-00-00
    
    0000-00-00 can come only from a problem in the 3.06.00.001 update

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 30 17:07:38 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 30 Nov 2011 16:07:38 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-92-g87311ca
Message-ID: <E1RVmh8-0000tc-LQ@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  87311ca00e6287022532799f10881366cc55b2ae (commit)
       via  384b9179e0ee916d7bec59dbb86cdee7d2ce0177 (commit)
      from  f0489763d66dde3309396755f7c1d0c6359be31b (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 87311ca00e6287022532799f10881366cc55b2ae
Merge: f048976 384b917
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Nov 30 17:07:29 2011 +0100

    Merge branch 'new/bug_6328'

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Nov 30 17:19:24 2011
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 30 Nov 2011 16:19:24 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.06.00-93-gc7ef4da
Message-ID: <E1RVmsV-0000wV-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  c7ef4da571cc5451e4922a0ad0f5a2d285d91f77 (commit)
      from  87311ca00e6287022532799f10881366cc55b2ae (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 c7ef4da571cc5451e4922a0ad0f5a2d285d91f77
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Nov 30 17:12:06 2011 +0100

    Revert "Fix for Bug 6291, Cart printing truncated in Firefox"
    
    see
    http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6291, comment 7, 9 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7279
    
    This reverts commit da0a5b2bd63027102dd61789fc455941e237abc9.

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/css/print.css |    9 ++-------
 koha-tmpl/opac-tmpl/prog/en/css/print.css     |    9 ++-------
 2 files changed, 4 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository