[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.03-48-g2d1ca97

[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.12.x has been updated
       via  2d1ca97d6501ae273dabfd7d71bb6cce4c5e6725 (commit)
       via  22f96c6ebeb77da5efe7285d1980ce705e22726e (commit)
       via  5e12ca5684ee19c54685a4dc935fb242eaf0c3bc (commit)
      from  8525d49e0601c85807235c007f712666c2abbceb (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 2d1ca97d6501ae273dabfd7d71bb6cce4c5e6725
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Fri Aug 16 16:52:26 2013 -0300

    Bug 10745: remove more ambiguity for translators for XSLT subfieldSelect parameters
    
    As in Bug 6278, this patch replace ">at<" with ">a_t<"
    so not to mislead translators. Found more cases that
    initial description.
    
    To test:
    
    1) Check that problem exists and only on xslt files,
    using your preferred language
    
    egrep -B10 "^msgid \"at\"" misc/translator/po/xx-YY-i-staff-t*
    
    2) Apply the patch
    
    3) Update translation file
    (cd misc/translator; perl translate update xx-YY)
    
    4) Verify the problem is gone, repeat 1
    
    5) If you like verify new entries in PO file
    
    egrep -B15 "^msgid \"a_t\"" misc/translator/po/xx-YY-i-staff-t*
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Tested this with field 780 and running a Dutch translation.
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 5b9cd85dd0dbd7e3470c783e0e024ad32df2f8b5)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 22f96c6ebeb77da5efe7285d1980ce705e22726e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 16 07:21:10 2013 -0400

    Bug 10664 [QA Followup] - fix error in overdue_notices.pl if there is no active currency
    
    Fixes the following koha-qa.pl error:
     FAIL   misc/cronjobs/overdue_notices.pl
        OK     pod
        OK     forbidden patterns
        OK     valid
        FAIL   critic
                   # Variables::ProhibitConditionalDeclarations:
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e476378323eb8dd31e67e4741d271d88de61b59e)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 5e12ca5684ee19c54685a4dc935fb242eaf0c3bc
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date:   Wed Jul 31 08:04:25 2013 +0200

    Bug 10664: fix error in overdue_notices.pl if there is no active currency
    
    If there is no active currency, when running overdue_notices.pl
    you get a sofware error "Can't use an undefined value as a HASH
    reference" on GetCurrency() function call.
    
    With this patch, if there is no active currency, fines are formated
    by default 0.00 and notices are correctly generated.
    
    Test plan :
    - have at least one borrower with overdue that should trigger a notice
    - verify that there is no active currency (Adminitration > Currency &
      Exchange rates)
    - run misc/cronjobs/overdue_notices.pl -v -n (to get the notice directly
      on output)
    
    => without the patch you get the software error
    => with the patch, notices are correctly generated
    
    If an active currency is defined, the script overdue_notices.pl runs
    the same with or without patch
    
    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 a9a3bb7b3d7e8e862cf0f772246667258a20b786)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    6 +++---
 .../prog/en/xslt/NORMARCslim2intranetDetail.xsl    |    2 +-
 .../prog/en/xslt/NORMARCslim2intranetResults.xsl   |    2 +-
 .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl    |    4 ++--
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl        |    2 +-
 .../prog/en/xslt/NORMARCslim2OPACResults.xsl       |    2 +-
 misc/cronjobs/overdue_notices.pl                   |    4 +++-
 7 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository