[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.02-21-g71f1c5e

[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  71f1c5ef820c7d492e4ce932fcbeebc0fcbfb2e1 (commit)
       via  190ee0ac2e2db1080f3a34b13a4fa8585e6043e6 (commit)
       via  cda70e0c817935a01a803a1c91fc1455564bd548 (commit)
       via  ef22b8bf23b7fdb5fa0d604c2bebcdd94b2a3795 (commit)
       via  9fe068bfd783454a4858689d45c84062f1a9f1fa (commit)
       via  58951f07449aca7cb318a5a369c7ecd9156f931b (commit)
      from  30bbf8b888fe912444f1d97b87dac57b34dacccd (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 71f1c5ef820c7d492e4ce932fcbeebc0fcbfb2e1
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Fri Dec 26 08:06:38 2014 +1300

    Database version 3.18.02.002

commit 190ee0ac2e2db1080f3a34b13a4fa8585e6043e6
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Dec 11 12:07:17 2014 +0100

    Bug 10753: Any library is represented by an empty string
    
    And not with "__ANY__"
    
    Test plan:
    0/ Don't apply this patch
    1/ Create a suggestion for "any library"
    2/ Verify suggestions.branchcode contain "__ANY__"
    3/ Apply this patch and execute the updatedb entry
    4/ Create a suggestion for "any library"
    5/ Verify suggestions.branchcode contain "" (for both suggestions).
    
    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 67c3217238d6193d953914e9f2eaf816683306d7)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit cda70e0c817935a01a803a1c91fc1455564bd548
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Dec 19 16:54:18 2014 -0300

    Bug 13436: DBRev 3.18.02.001
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Note: it also fixes a minor POD error.
    (cherry picked from commit cbf784bb9d8c01d1c05cae00d046d3799a1d7ed9)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit ef22b8bf23b7fdb5fa0d604c2bebcdd94b2a3795
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Dec 19 16:45:23 2014 -0300

    Bug 13436: (RM followup) university -> academic DB update
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 281b3225fcbafbb26568f57c2547c4fe13bde017)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

commit 9fe068bfd783454a4858689d45c84062f1a9f1fa
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Mon Dec 15 20:57:56 2014 +0000

    Bug 13436: Adding more options to UsageStatsLibraryType syspref
    
    Added options:
    - research
    - private
    - society or association
    - corporate
    - government
    - religious organization
    - subscription
    - school
    
    Also changed 'university' to 'academic'
    
    To test:
    1) Go on to Global System Preferences and find UsageStatsLibraryType under Administration
    2) Click drop-down menu and see all new options described above, as well as 'academic' instead of 'university'
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Amended patch: replace tab with spaces
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 30e40bd8847d3b015477bae50f6a40358d9f70ca)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 58951f07449aca7cb318a5a369c7ecd9156f931b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Nov 30 08:18:11 2014 +0100

    Bug 12565: Acq: Fix broken link in breadcrumbs
    
    The link back to the basket when creating an order by
    searching for an existing record in the catalog is
    broken.
    
    To test:
    - Start a new basket
    - Create a new order line by searching for an existing
      record in your catalog
    - Try the link back to the basket from the breadcrumbs
      at the result list page
    - Verify that the link is broken
    - Apply patch and retest
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e04b3ef0685f2bbe8a25b65181c937b8eb5e34d3)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 installer/data/mysql/sysprefs.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl             |   21 ++++++++++++++++++++
 .../prog/en/modules/acqui/neworderbiblio.tt        |    2 +-
 .../prog/en/modules/admin/preferences/admin.pref   |   10 +++++++++-
 .../prog/en/modules/suggestion/suggestion.tt       |    2 +-
 kohaversion.pl                                     |    3 ++-
 6 files changed, 35 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository