[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1309-gf17fab3

[Git repo owner]

This is an automated email from the git hooks/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  f17fab3ed9b4cef1bd8932376fbdc8733d899fab (commit)
       via  4ce18e2a86b0af7548caaeaf26f7571d2244e35e (commit)
       via  4458e86865d09196591646e29a319958c8680578 (commit)
      from  728670f467484f8ec84aa4f9edebf1446f13b912 (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 f17fab3ed9b4cef1bd8932376fbdc8733d899fab
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>

commit 4ce18e2a86b0af7548caaeaf26f7571d2244e35e
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>

commit 4458e86865d09196591646e29a319958c8680578
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>

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

Summary of changes:
 C4/Serials.pm                                         |    9 ++++++++-
 .../prog/en/modules/acqui/newordersubscription.tt     |    2 +-
 .../prog/en/modules/serials/serials-search.tt         |    2 +-
 t/db_dependent/Bookseller.t                           |   17 +++++++++++++----
 4 files changed, 23 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository