[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.06-65-gf4ae9ba

Tue Nov 19 18:43:42 CET 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  f4ae9bad32d3b1dd656cee84e28938b6613d3b8b (commit)
       via  0590e2fd5d21c23eb6a24e82658626cb0e42ee87 (commit)
       via  149890acf6bb03d2c9beb3e25332b9f3bb82a977 (commit)
       via  111cd8faa2c0b006130a8c43a55b098e94e42fc9 (commit)
       via  be2dc42ffcf751bcb8e98359c08aa2f6ba7a7bb9 (commit)
       via  7f8309b7936dd7c7d5b65ed1547255b6575356cf (commit)
      from  748c14eac169612a60f056c2b7ec6511267ff29d (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 f4ae9bad32d3b1dd656cee84e28938b6613d3b8b
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Sep 18 15:11:46 2013 +0200

    Bug 10689: make subscription public note appear when making a new order from a subscription

    Test by creating a new order to a basket using "From a subscription" link

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

    When creating a new basket from a susbcription, public note shows
    on Notes column.

    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Tiny enhancement, passes tests and QA script.
    Works as described.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 4ce18e2a86b0af7548caaeaf26f7571d2244e35e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 0590e2fd5d21c23eb6a24e82658626cb0e42ee87
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Tue Aug 6 12:13:34 2013 +0200

    Bug 10689: make public note appear in subscriptions search

    In a serials module, when searching subscriptions, the results table as
    a "Notes" column.
    In TT code, you see that it tries to display public note
    "subscription.notes" and internal note "subscription.internalnotes".

    The internal note is displayed well but not the public note.

    You can see the 2 notes in serial details in summary tab.

    The problem commes from the SQL query. A join is perform on subscription
    and biblio, both containing a "notes" column.

    This patch solves the problem by using a alias in query for both columns
    (biblio.notes is acutally not used in template but could be).

    Test plan :
    - Edit a subscription
    - Add public and internal notes. For example : "too busy" and "on holiday"
    - Perform a subscription search that returns this subscription
    => "Notes" column contains both notes. For example : "too busy (on holiday)"
    - Test with only public note
    - Test with only internal note

    Works as described.
    Signed-off-by:Mathieu Saby <mathieu.saby at uhb.fr>
    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.
    Works as described, fixes a bug as the templates show that
    the intention was to display both notes in the column.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 4458e86865d09196591646e29a319958c8680578)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 149890acf6bb03d2c9beb3e25332b9f3bb82a977
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Oct 11 04:20:18 2013 +0000

    Bug 10689: add regression test

    This adds a test to verify that the public subscription
    note is returned by a subscription search.

    To test:

    [1] Verify that t/db_dependent/Bookseller.t passes.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit f17fab3ed9b4cef1bd8932376fbdc8733d899fab)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 111cd8faa2c0b006130a8c43a55b098e94e42fc9
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Aug 30 13:17:55 2013 -0300

    Bug 10624: add 'status' option switch for the packages init script

    This patch makes the init script return the status of the relevant
    processes.

    To test:
    - Apply the patch, build package and install
    - Run
     $ service koha-common status

    Note: it can be tested just copying the debian/koha-common.init script
    to a server running koha-common instances and calling it

     $ ./koha-common.init status

    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 45b5bef8931470badfacd33eeb31acd634cdeb9f)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit be2dc42ffcf751bcb8e98359c08aa2f6ba7a7bb9
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Wed Aug 28 15:32:24 2013 +0200

    Bug 10430: arrived and stopped status are not possible in serial claim

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit bdbe2545cdc111567f565374ae67e23ccac98838)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 7f8309b7936dd7c7d5b65ed1547255b6575356cf
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date:   Fri Jun 7 12:14:02 2013 +0200

    Bug 10430 - status filter not working in serial claims when translated

    With a translated intranet (ie fr-FR) the status filter does not work
    for "Late" status.  It is because status in combobox filter is
    translated "Retard" and status in table is translated "En retard".

    This patch changed javascript filter to work on a status code instead
    of status name.
    The new classes may be used to change CSS depending on status.

    Test plan :
    - Use a translated intranet (ie fr-FR)
    - Go to serials claim of a vendor with issues of multiple status
    - Check that status filter does its work

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch passes all tests and QA script.
    The status filter should probably be changed to only
    allow filtering on status that can appear on the page.

    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 9b5d891bf5cf095359c069960f9eae6e318b4126)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 C4/Serials.pm                                      |    9 ++-
 debian/koha-common.init                            |   80 ++++++++++++++++++--
 .../prog/en/modules/acqui/newordersubscription.tt  |    2 +-
 .../prog/en/modules/serials/claims.tt              |   46 +++++------
 .../prog/en/modules/serials/serials-search.tt      |    2 +-
 t/db_dependent/Bookseller.t                        |   17 ++++-
 6 files changed, 120 insertions(+), 36 deletions(-)

hooks/post-receive
-- 
main Koha release repository