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

Thu Nov 7 16:39:11 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  b178a758a2b3a6b7ee1c0b5beaf3460daf0057d2 (commit)
       via  8f10bef6310f9805508ecd60ecef970a6d4e718c (commit)
       via  0781cb870c03dc0aa516b659214e25f44e081119 (commit)
       via  d5d0708662f5493a93b4ea29b5e7290276e0db4f (commit)
       via  80b2c6d7da95ea67bb8f0ece2f0cb97d99a15af9 (commit)
       via  d1c20773a0c26c0a7e72fbbd500bc0cf78538349 (commit)
       via  28e5e116d8cab8e4f5ae2cb28ef590753592c355 (commit)
      from  63fa18513fceb8fee6b6a35d885ec50b0d55c969 (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 b178a758a2b3a6b7ee1c0b5beaf3460daf0057d2
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon Sep 16 18:38:50 2013 +0000

    Bug 9372: (follow-up) tidy whitespace in new lines

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

commit 8f10bef6310f9805508ecd60ecef970a6d4e718c
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Fri Aug 2 15:48:27 2013 +0200

    Bug 9372: replace carriage return with <br /> in printed HTML files for overdues

    For PDF generation, HTML files need explicit <br /> HTML tags. With
    this patch, carriage return are replaced by <br /> when letters are
    written into HTML files.

    Test plan :
    - Ensure you've got at least one reader with overdue triggering notice
    - Ensure that your notice template got HTML checked
    - Run misc/cronjobs/overdue_notices.pl -v -n -html <dirname>
      and misc/cronjobs/printoverdues.sh <dirname>

    Without patch, the content of the letter is all on one line in PDF file
    With the patch, PDF file is correctly formated

    - remove your reader email
    - Run misc/cronjobs/overdue_notices.pl -v -html <dirname>
      and misc/cronjobs/printoverdues.sh <dirname>

    Without patch, the content of PDF file is all on one line
    with the patch, PDF file is correctly formated.

    - restore reader email
    - run misc/cronjobs/overdue_notice.pl -v -html <dirname>

    Verify that the a message has been generated in message_queue table
    With or without patch, the message is the same

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6dbfe1512dc39e82084f9aa8b8ecce38fa24c5c5)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 0781cb870c03dc0aa516b659214e25f44e081119
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Sep 8 01:03:35 2013 +0200

    Bug 10841: Make edit/delete item context links in cataloguing translatable

    HTML created with Javascript is not translatable the way HTML is
    normally translated. _() syntax has to be used to have strings
    translatable.

    To test:
    - Edit items for a record with multiple items
    - Click somewhere in the items table
    - Verify the links for editing and deleting items show up and work correctly
    - Apply patch
    - Verify the links still show the same behaviour

    Bonus:
    - Run 'perl translate update <languagecode>' in misc/translator
    - Verify that Edit item and Delete item show up in the po file, translate them
    - Install updated po files running 'perl translate install <languagecode>'
    - Verify links show up translated and work correctly

    Patch also fixes capitalization for a couple of error messages - only change
    there is: Deleted > deleted.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    (cherry picked from commit 7c82fe1a670892b07f426f356c67bc3cd60a37f3)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit d5d0708662f5493a93b4ea29b5e7290276e0db4f
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Jul 19 09:07:52 2013 -0400

    Bug 8821: make receive shipment page hide inactive funds like new order form

    This patch adapts the fund-handling code from neworderempty.pl
    in order to limit the display of funds by default to active ones,
    with the option to check a box to display all funds.

    This patch also adds "(inactive)" to the display of funds on this and
    the neworderempty.tt template because it seemed like that was useful
    information.

    To test, make sure you have both active and inactive funds.
    Start the process of receiving a shipment. The "fund" option
    in the receive shipment form should show only active funds.
    Checking the "show all" checkbox should allow you to choose
    from both active and inactive funds.

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 04aa35077730bdd4bc8d3c01c461518ecb0d9e60)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 80b2c6d7da95ea67bb8f0ece2f0cb97d99a15af9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Jul 10 22:56:13 2013 +0200

    Bug 10570: Show nonpublic note on check expiration page

    The check expiration page in serials only showed the OPAC note,
    but it makes sense to also show the nonpublic note here.

    This patch adds it.

    To test:
    - Add a subscription, make sure to enter different notes in
      nonpublic note and OPAC note to check for display later on.
    - Go to the check expiration page and search for your subscription.
    - Check both notes show up correctly.

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 29498bf696d86a761708ec59f0a75be6353feecf)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit d1c20773a0c26c0a7e72fbbd500bc0cf78538349
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon May 27 15:56:28 2013 +0200

    Bug 9618: (follow-up) include link to jQuery only if needed

    The jQuery lib is useful only if js code is filled into the
    intranetuserjs pref.

    Signed-off-by: Campbell Reid-Tait <campbellreidtait at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>

    To test:
    - Use Quick spine label creator
    - Make sure you have Javascript in your intranetuserjs system
      preference
    - Validate Javascript effect on screen or check source code
      to make sure your code is visible there.

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

commit 28e5e116d8cab8e4f5ae2cb28ef590753592c355
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Mar 18 15:13:09 2013 -0400

    Bug 9618: Add support for intranetuserjs to labels/spinelabel-print.pl

    The template for printing a single spine label is a stripped-down
    version of a standard Koha template, but it should include
    intranetuserjs and IntranetUserCSS so that libraries can make local
    customizations.

    This patch updates the page's DOCTYPE to HTML5 and adds the missing
    markup for including those preferences. Also added is jQuery, since
    there's a good chance local customizations are using jQuery.

    To test, make sure there is something in your intranetuserjs and
    IntranetUserCSS system preferences. Visit
    /cgi-bin/koha/labels/spinelabel-home.pl and submit a barcode. View
    source on the spine label output page and confirm that your custom js
    and css were included correctly.

    Signed-off-by: Campbell Reid-Tait <campbellreidtait at gmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Template only change, works nicely.

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

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

Summary of changes:
 acqui/parcels.pl                                   |   24 +++++++++++++++-----
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |   23 ++++++++++++++++++-
 .../prog/en/modules/cataloguing/additem.tt         |   10 ++++----
 .../prog/en/modules/labels/spinelabel-print.tt     |   20 +++++++++-------
 .../prog/en/modules/serials/checkexpiration.tt     |    8 +++++--
 misc/cronjobs/overdue_notices.pl                   |    5 +++-
 7 files changed, 68 insertions(+), 24 deletions(-)

hooks/post-receive
-- 
main Koha release repository