[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.03-26-g016b111

[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  016b111d4e6281c5d8618acd8a5563f627957952 (commit)
       via  70282cf9a4edbd09f7482cefa5968d6149965e7b (commit)
       via  07a81a496d395c20e93e362305b28aa9e913c936 (commit)
      from  36da7efe95c2e1509aef76a13e3fc09f0d531db2 (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 016b111d4e6281c5d8618acd8a5563f627957952
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jan 1 16:38:34 2015 -0500

    Bug 13441 - Branchcodes should not be allowed to have spaces in them
    
    In multiple cases I've seen issues arise in Koha where a librarian
    accidentally puts a space at the end of a new branchcode. This of course
    causes endless confusion because the branchcode looks perfectly fine in
    every case unless you wrap the code with some characters to reveal the
    hidden space!
    
    Test Plan:
    1) Try creating a new branch with one or more spaces in the branchcode
    2) Note you are able to
    3) Apply this patch
    4) Repeat step 1
    5) Note you are no longer able to
    
    Followed test plan with cache cleared. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, passes tests and QA script.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit a7c41e6073a2719e21f86909a37daab6410b2b96)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 70282cf9a4edbd09f7482cefa5968d6149965e7b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Nov 10 10:45:25 2014 +0100

    Bug 12905: funds with children could not be deleted
    
    The interface should prevent to delete funds with children.
    Otherwise the relationship is broken and problems occur:
    1/ You don't see the orphan fund in the fund list
    2/ You cannot edit the orphan fund amount ('Fund amount exceeds parent
    allocation').
    
    This patch:
    - adds a JS check, template side
    - adds a check in the perl script (should never be true)
    - adds an updatedatabase check, in order to alert users with inconsistent data.
    
    Test plan:
    Verify you are not allow to delete a fund with children.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 522e9c5861854fad7c9b292f75ebd19968f5b11c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 07a81a496d395c20e93e362305b28aa9e913c936
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Nov 25 12:23:45 2014 +0100

    Bug 13333: Fix Display basket group for already received orders
    
    Bug 11111 adds a basket group column on the parcel page.
    But it seems that the already received orders never contain the value
    (always 'no basket group').
    
    Test plan:
    Receive an order which is in a basket group and verify the basket group
    column is correctly filled.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 74640683f0d7f4b9734a69763424b33977f66cfd)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Acquisition.pm                                  |   14 ++++++++-----
 admin/aqbudgets.pl                                 |    6 ++++++
 installer/data/mysql/updatedatabase.pl             |   22 ++++++++++++++++++++
 .../prog/en/modules/admin/aqbudgets.tt             |   11 +++++++++-
 .../prog/en/modules/admin/branches.tt              |   20 ++++++++++++++----
 t/db_dependent/Acquisition/Invoices.t              |    9 ++++----
 6 files changed, 68 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
main Koha release repository