[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.07-63-g20c58b3

[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  20c58b3a45c97aab6d5c5feb91abea0be472bd64 (commit)
       via  9bc40436c22458f6f61c11df10dd0a28d05450b9 (commit)
       via  f16fad109ea699329c4730a3d8bbd75e3cccf164 (commit)
       via  acdf4eaae98e9d16f6d94533343a7150d38f73ee (commit)
       via  839cf9f460bd17fb3fc54e2b38ab7a4303160b50 (commit)
      from  4f702796b0439e830a6c6ada7bec6afdaaa7b27e (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 20c58b3a45c97aab6d5c5feb91abea0be472bd64
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Fri Nov 1 00:08:04 2013 +0000

    Bug 9374: (follow-up) add FIXME suggesting that use of a regexp is not the long-term solution
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 8ae61b6a2a6b2c6e27f33d1d32e1849265782530)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 9bc40436c22458f6f61c11df10dd0a28d05450b9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Sep 19 17:03:00 2013 +0200

    Bug 9374: The color should manage all zero format.
    
    The format of prices in Koha is discuted in some bugs (e.g. 9410).
    The good way will be to introduce a syspref in order to deal with the
    number of decimal.
    The previous patch is too restrictive, we should deal with other zero
    format.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit c523b56bcf0eccb2feb342fe962e590d74baa749)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit f16fad109ea699329c4730a3d8bbd75e3cccf164
Author: Mathieu Saby <mathieu.saby at univ-rennes2.fr>
Date:   Sun Sep 15 13:09:20 2013 +0200

    Bug 9374: Only 0.00 prices must have class error in basket.tt
    
    A regexp '^0' in basket.tt is used to give the class "error" to null prices.
    It is wrong, because it matches prices like "0.15". It should only match "0.00".
    
    To test :
    - apply the patch
    - display a basket with an order with a price between 0 and 1 (like "0.50") and an order with a price stricty null ("0.00")
    - only the "0.00" price should be displayed in red
    
    Signed-off-by: Cedric Vita <cedric.vita at dracenie.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit cbe0d7bebdd0de8e15d1f5fe3cb12da3160baa64)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit acdf4eaae98e9d16f6d94533343a7150d38f73ee
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Oct 8 10:52:28 2013 +0200

    Bug 9218: fix intranet cart email for non english templates
    
    This patch adapts the method from OPAC to the staff interface (cf bug 8062).
    
    Test plan:
    - add somes notices to the cart
    - try to send the cart by email
    - the email should be the same as before
    - translate templates and retry with another language. Before this patch,
      the email was empty. With this patch, it contains the list of records
      and items.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Passes all tests and QA script.
    Fixes quite a bad translation problem, tested with German templates
    and umlauts in the message and records.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit c4c5496ec656ee4745587b3cea239cc849d2c09a)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 839cf9f460bd17fb3fc54e2b38ab7a4303160b50
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Thu Aug 22 16:55:48 2013 +1200

    Bug 10776: fix awkward wording in subscription notification screen
    
    to test:
    - make a subscription available to be notified about
    - log into the opac, click the subscriptions tab, then More details
    - click "Subscribe to email notification on new issues"
    - observe the text without the patch - there seems to be an extra "arrive?"
    - apply the patch, refresh - wording should flow a bit better.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixes bad wording and works as described.
    Passes all tests and QA script, template change only.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 6398126f8899b57380fbc32d23662ba0e9c48f43)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 basket/sendbasket.pl                               |   16 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   20 ++-
 .../prog/en/modules/basket/sendbasket.tt           |  174 ++++++++++++++++----
 .../prog/en/modules/opac-alert-subscribe.tt        |    3 +-
 4 files changed, 168 insertions(+), 45 deletions(-)


hooks/post-receive
-- 
main Koha release repository