[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.00-169-gbde14b5

[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.2.x has been updated
       via  bde14b5135cbb5cdb592417621a8ef1069975a7d (commit)
       via  96236d465e0162d27daae4069a0ec6f029a79282 (commit)
      from  920b2d5d603c6f8074a0e6ecd0c46d015d4ec26b (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 bde14b5135cbb5cdb592417621a8ef1069975a7d
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Nov 15 18:13:32 2010 -0500

    Another bug 5004 fix, this time for road types
    
    The road types interface didn't block deletion of road
    types in use, but the script included the same queries
    that cities.pl did, as if it intended to.
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 14b66041f0dc08a5618985b44e1816a6c9978f45)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 96236d465e0162d27daae4069a0ec6f029a79282
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Nov 15 08:09:11 2010 -0500

    Fix for Bug 5004, Don't block deletion of cities when instances exist in borrowers table
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit a36a7e1e61ac0ef7b2b79065432f028edef9d49e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 admin/cities.pl                                    |    9 ++-------
 admin/roadtype.pl                                  |    8 --------
 .../prog/en/modules/admin/cities.tmpl              |   10 ----------
 3 files changed, 2 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
main Koha release repository