[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.09-51-g5eed8f2

Mon Aug 5 02:21:55 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.10.x has been updated
       via  5eed8f2d5effcb5a3487b35e6765173f92b47b00 (commit)
       via  7cd4ceda9448e4db72ff880c37777edd5207aa24 (commit)
       via  c8c5f74e65937a38f386c78716550deaf4e68da9 (commit)
       via  5bfbbbefc025ab638cc31ca1b5856238bd6caac5 (commit)
       via  1eb41a81ee0b07026e22d069279e1be2b37caae3 (commit)
      from  1252afb7bfa7833738065b6d6fc2d1c0990410ab (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 5eed8f2d5effcb5a3487b35e6765173f92b47b00
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 20 08:38:46 2013 -0700

    Bug 10170: expose more managed staged MARC strings to translation

    This commit makes it possible to translated the 'staged'
    and 'error' record statuses as well as the 'auto_match'
    overlay status.

    Also takes out a bit of HTML cruft in one string that is
    not needed for translation.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests pass. New strings are parsed into the po files:
    "%s Always add items %s Add items only if matching bib was found %s Add items only if no matching bib was found %s Ignore items %s %s %s %s "
    "%s No match %s Match applied %s Match found %s %s %s "
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7d990042e9dcc86e6f60b923763720d5c9ed6b2c)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e2fac72763cd541eef32d7278dea33dadc1aa6cc)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit e2fac72763cd541eef32d7278dea33dadc1aa6cc)

commit 7cd4ceda9448e4db72ff880c37777edd5207aa24
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date:   Thu May 2 16:56:54 2013 +0200

    Bug 10170: strings in MARC import made translatable

    Following bug 9215: non translatable strings are now
    present in the template and translatable

    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

    Not only does this make the strings translatable it makes the template
    a lot easier to read
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests pass.
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 24e561f4da56e442dc1a9d25afa63e8ab74d9236)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit f67769bc637c2acb7eb4593374f4d1db06d06266)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit f67769bc637c2acb7eb4593374f4d1db06d06266)

commit c8c5f74e65937a38f386c78716550deaf4e68da9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jul 9 11:52:31 2013 +0200

    Bug 10556: The delivery time is not inserted on adding a supplier.

    Test plan:
    Add/edit a supplier and check that the delivery time is set in DB.

    Note: This patch cleans the code (sql query) in order to see easily if a
    problem occurred.

    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b95c3134a8a38ba430f7d70173f91e055b4fa30e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 4251c1f8185bb91df17949b903391ad29d58f6f0)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 4251c1f8185bb91df17949b903391ad29d58f6f0)

commit 5bfbbbefc025ab638cc31ca1b5856238bd6caac5
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jun 25 09:09:38 2013 +0200

    Bug 10504: Remove the unused C4::Acq::ModOrderItem routine

    This routine has been introduced by commit 2d90fb22d43db986547bbaa945873d6dd78aab71.
    The only call has been removed by commit 9eba7dc594fc0d4698da5e791d5f6f8682b2712a.

    So now, this routine is useless.

    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9f4f1ceafe218afcbc55d6dfb9ac1e32fc11803a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 3b6abb0ea18720eef688241aa2c2e6399d922fa0)

    Conflicts:

    	C4/Acquisition.pm

    Solved

    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 3b6abb0ea18720eef688241aa2c2e6399d922fa0)

commit 1eb41a81ee0b07026e22d069279e1be2b37caae3
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Jul 2 12:56:21 2013 +0200

    Bug 10527: remove disused routine C4::Branch::get_branch_code_from_name

    This routine is not in used and does not make sense. It should not be
    used later.

    Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Passes koha-qa.pl, not references to get_branch_code_from_name found.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 7d930649065663325de95c3f8ecdbcea3bddb3b5)

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit aa15f7031bc7d9c0f2c9901db491dada53f21c65)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit aa15f7031bc7d9c0f2c9901db491dada53f21c65)

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

Summary of changes:
 C4/Acquisition.pm                                  |   33 +--------
 C4/Bookseller.pm                                   |   43 +++++-----
 C4/Branch.pm                                       |   11 +---
 cataloguing/moveitem.pl                            |    2 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |   84 ++++++++++++++++++--
 labels/label-edit-batch.pl                         |    1 -
 labels/label-manage.pl                             |    1 -
 patroncards/edit-batch.pl                          |    1 -
 patroncards/manage.pl                              |    1 -
 tools/manage-marc-import.pl                        |    1 -
 10 files changed, 100 insertions(+), 78 deletions(-)

hooks/post-receive
-- 
main Koha release repository