[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.02-7-g3666204

[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, 3.18.x has been updated
       via  36662044754b297356fada6d47453769d4dbeaaf (commit)
       via  b970d1ef116a68c5d1896ad27e0cc61021022b60 (commit)
       via  2edde60ffb42dac9d8916f85348331d22629cadc (commit)
       via  3f49f2d7f8573cdd25dc0ea1cd63d43340e148eb (commit)
      from  5ada5a2fb4fc8feee4795470783753aaa1d7152e (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 36662044754b297356fada6d47453769d4dbeaaf
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Dec 4 16:05:34 2014 +0100

    Bug 12059: Prefer to list fields in the query
    
    To avoir further issue, it's better to explicitely list the fields we
    want to retrieve.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit bf681e28bab3d6c5b3a190dd7fe453369d600696)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit b970d1ef116a68c5d1896ad27e0cc61021022b60
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Nov 10 09:55:52 2014 +0100

    Bug 12059: Publisher column on invoice page always empty
    
    This patch moves the publisher information out of its own
    always empty column into the Summary column below the title,
    as it is on other acq pages.
    
    The information was never displaying, as publishercode is in
    biblioitems and that table was not selected by GetInvoiceDetails.
    
    Also modified the code to take into account that UNIMARC uses
    biblioitems.publicationyear and MARC21/NORMARC use bibio.copyrightdate
    for the copyright year.
    
    To test:
    - create an invoice for records that
      - have a publication year
      - have no publication year
      - have a publisher...
    - 'finish receiving' and check the invoice summary page
       ...acqui/invoice.pl?invoiceid=?
    - Make sure all the information displays now but didn't witout the patch.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit d9c99b6f5ef40bb546231cf35581d4308f1ae3bc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 2edde60ffb42dac9d8916f85348331d22629cadc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Dec 12 07:00:29 2014 -0500

    Bug 13410 [QA Followup]
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit c7081a0852b8d627328e503cfe53b8f32e6d623a)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 3f49f2d7f8573cdd25dc0ea1cd63d43340e148eb
Author: Marc Véron <veron at veron.ch>
Date:   Tue Dec 9 05:21:06 2014 +0100

    Bug 13410 - Untranslatable "Change messaging preferences to default for this category?"
    
    To test:
    In staff client, go to Home > Patrons
    Click button "New patron" and choose a category
    Change Patron messaging preferences
    Now change Category
    Make sure that following message box still appears: "Change messaging
    preferences to default for this category?"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 6d37e83e4dc98d4e5a061428386eb4ce0c05ef33)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 C4/Acquisition.pm                                   |    7 ++++++-
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt  |   19 +++++++++----------
 .../prog/en/modules/members/memberentrygen.tt       |    2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
main Koha release repository