[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-beta1-242-g1a934d0

Sun Apr 21 15:38:51 CEST 2013

This is an automated email from the git hooks/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.12.x has been updated
       via  1a934d0fcc7e52f58ad5e5fc77a0b7218efa51f5 (commit)
       via  e2d725aa92a84c5da81940d0f41c9c3560c74174 (commit)
       via  4d49c174dd68a042e777f9d3be3750d4d0cf3e06 (commit)
       via  67200321898303504f708791891ee97f3f35c02e (commit)
       via  e633e4b045ff7b8894f0d746e450450db828dae3 (commit)
       via  5f3777350b4e69b36d4c164af2b520e6a832c70c (commit)
       via  90e3fae692147b78cceb7ce49aee470066071958 (commit)
       via  439221c1c5a72f55c8b91dc4db119d462b7dad4a (commit)
       via  055c09fc2de20bbf0f5c2600e7dbeb32e491ae7e (commit)
      from  5c4c680fa69c2af8643a61268b5568c57401e5b1 (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 1a934d0fcc7e52f58ad5e5fc77a0b7218efa51f5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Sun Apr 21 09:43:16 2013 -0400

    Add Barry Cannon to the history file

    Welcome, Barry, you are the 208th developer with a patch in Koha!
    (cherry picked from commit d2c989713999cab4a7b4bf7ea69e2d7d036e876c)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit e2d725aa92a84c5da81940d0f41c9c3560c74174
Author: Mason James <mtj at kohaaloha.com>
Date:   Tue Apr 2 22:36:16 2013 +1300

    Bug 8745: General whitespace and tab tidy

    http://bugs.koha-community.org/show_bug.cgi?id=8745
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    1) Runs not with root.
    2) Runs with root and -run-as-root.
    3) Runs using the normal koha user.

    Note: Maybe the message should be clear about why
    running as root is bad and which user you should
    be running the script with?
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 2eefd1f3a588532950bed42ff20fcb6ff3f932a3)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 4d49c174dd68a042e777f9d3be3750d4d0cf3e06
Author: Barry Cannon <barry at oslo.ie>
Date:   Mon Sep 10 15:23:29 2012 +0100

    Bug 8745 - Disallow rebuild_zebra.pl from executing, when run by root user.

    Added a check to warn users of execution as root user.
    Added a 'runas-root' switch to allow users to force execution as root user.

    Signed-off-by: Mason James <mtj at kohaaloha.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit ef86a77801ea42eb1f703a77f53123ccb924a9fe)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 67200321898303504f708791891ee97f3f35c02e
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Thu Feb 14 14:23:30 2013 +0100

    Bug 9613: items namespace missing in XSLT

    In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined.

    This patch add this namespace where missing.
    Also corrects a koha.org, instead of koha-community.org, in one namespace URL.

    Test plan :
    - Enable XSLT on search results
    - Perform a search
    => Look at error logs to check that there is no xsl error like :
    [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb  8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
    [Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb  8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
    Passed-QA-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    With comment on Bugzilla.

    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 00b587e5ccc3de4d457eef45008ce9741146ab13)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit e633e4b045ff7b8894f0d746e450450db828dae3
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Apr 14 17:29:20 2013 +0200

    Bug 10046: Standardize terms used in invoices

    Changes are:
    budget > where actually fund is meant
    branch > library
    bookseller, supplier > vendor

    To test:

    1) Receive a shipment, check the little form where you
       enter your invoice number for correct use of terms.
    2) Receive some orders and save finish receiving.
    3) Search for your created invoice. Check filters and
       results table for correct use of terms.
    4) Look at the details of your invoice, repeat check there.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 9a67617eaffc8427441c1270e9b0acd0a7d2f33d)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 5f3777350b4e69b36d4c164af2b520e6a832c70c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Apr 8 10:13:11 2013 -0400

    Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned

    The fix for Bug 9397 moved the "cannot check in" heading from within the
    one conditional where it should have been displayed to the top of all
    check-in errors/messages. "Cannot check in" is still only valid if the
    item is withdrawn and BlockReturnOfWithdrawnItems is ON.

    In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this
    patch puts "cannot check in" back into the correct conditional and adds
    a generic heading to check in messages for accessibility purposes.

    To test, check in items which will trigger a variety of errors
    including:

    - item must be returned to home library
    - item is lost
    - item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off)
    - item is overdue

    ...as well as items which should check in normally. Messages should
    display correctly.

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 3ce75bcf2631bccb584dff6ea2f78d16f49770f8)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 90e3fae692147b78cceb7ce49aee470066071958
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Tue Mar 19 13:54:32 2013 +0000

    Bug 8746 [Follow-up] Replace == by eq in string comparison

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests and QA script pass.
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit 357cf7fdd850008e4c4f94a4d8d115490a3f4262)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 439221c1c5a72f55c8b91dc4db119d462b7dad4a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Jan 11 11:57:41 2013 +0100

    Bug 8746: Fix indexation in DOM index mode

    When in DOM index mode, files exported by `rebuild_zebra.pl -x` are
    wrapped by '<collection></collection>' tag.
    This is a problem because splitting files produces invalid files.
    This is fixed by adding the missing <collection> tags in each generated
    file.
    Another problem was that the wrong zebra configuration file was used.
    The script now uses C4::Context->zebraconfig($server)->{config} to know
    which configuration file has to be used.

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit a4e844369106f0713123c8a2ecec12b0ed7b0027)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

commit 055c09fc2de20bbf0f5c2600e7dbeb32e491ae7e
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Sep 20 12:12:31 2012 +0200

    Bug 8746: rebuild_zebra_sliced.sh now export/index records as MARCXML

    This avoid indexing failures due to "bad offset" or "bad length" error
    with ISO2709 format

    + minor improvements:
      -  --length parameter is optional. If not given, it will execute the
         right sql query to find the number of records to index
      -  new parameter --reset-index. If set, index is reset before indexing

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Comment: Work as described. No errors.

    Test: Edit record to make it longer than 9999. Without patch rebuild_sliced
    fails. With patches works.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    (cherry picked from commit eef4b3f23c0b4558bd2a87af009f39012393994c)

    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>

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

Summary of changes:
 docs/history.txt                                   |    1 +
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |   14 +-
 .../prog/en/modules/acqui/invoices.tt              |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    4 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    3 +-
 .../prog/en/xslt/UNIMARCslim2intranetResults.xsl   |    2 +-
 .../prog/en/xslt/UNIMARCslimUtils.xsl              |    1 +
 .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl    |    1 +
 misc/migration_tools/rebuild_zebra.pl              |  101 ++++++++-------
 misc/migration_tools/rebuild_zebra_sliced.sh       |  135 ++++++++++++++++---
 10 files changed, 187 insertions(+), 79 deletions(-)

hooks/post-receive
-- 
main Koha release repository