[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.05-75-ge83e2a4

Git repo owner gitmaster at git.koha-community.org
Thu May 30 22:37:19 CEST 2019


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, 18.11.x has been updated
       via  e83e2a47a3fc490634be78750e5464ffef894667 (commit)
       via  2ed7ecc7ee274f59ebf4dc81e85f0d78a3d5dc99 (commit)
       via  3b16af5dbd26682ba3626407d87e35e1d74a2b12 (commit)
       via  70760ebdb7928f33d0c1fad6806e64dae3ae4068 (commit)
       via  54c8f463de9ddaa479db642df08c7c4ce48f5c47 (commit)
       via  fcd3989eab76fcc779343df11328565ad77446f4 (commit)
       via  7aa7ca51f275acb3b46d290e700bf9fdba743070 (commit)
       via  f11eaf3cbf6d35af6c49d9384b0c086cb457b901 (commit)
       via  d8519050bc303ab2e3fe1a0f3e715cf7fabe43a0 (commit)
      from  2812c386f609cd9a688732624a8442cf99bc3a37 (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 e83e2a47a3fc490634be78750e5464ffef894667
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 14 12:21:57 2019 -0500

    Bug 22908: Add tests
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 9613d9f1647bfceeb15b60c731f2c84796a12f87)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 2ed7ecc7ee274f59ebf4dc81e85f0d78a3d5dc99
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 14 12:23:25 2019 -0500

    Bug 22908: Prevent ModSuggestion to send a notice if something wrong happened
    
    There is a return value $status_update_table that is set to 0, then we
    send the alert (whatever the value of this variable). We must return
    earlier if something happened!
    
    Test plan:
    Not sure how to recreate it via the interface, so just run the tests?
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 39c4d9d55e5a2e137adbbbd2b29b5b829f66b59e)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 3b16af5dbd26682ba3626407d87e35e1d74a2b12
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed May 22 14:37:53 2019 +0000

    Bug 17698: (RM follow-up) Pass lang variable so letter can be translated
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d7e3b483714436772c47ba0f8d33e5ace74c1427)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 70760ebdb7928f33d0c1fad6806e64dae3ae4068
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed May 22 14:32:26 2019 +0000

    Bug 14385: (RM follow-up) Remove line from bad rebase
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 78b866fcd9f792f1195b90d7a49566f0055e658c)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 54c8f463de9ddaa479db642df08c7c4ce48f5c47
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon May 13 15:34:47 2019 +0000

    Bug 22896: Missing inputs in transfer modal
    
    This patch restores hidden inputs to save overridden checkin date and other data
    
    Currently we lose the list of checkouts and several settings when items with transfers are checked in
    
    To test:
    1 - Find an item from another branch
    2 - Set a checkin date and click the box for the date to be remembered
    3 - Check in the item
    4 - Click ok or print, note the checkin date is lost
    5 - Apply patch
    6 - Repeat
    7 - Checkin date remains
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit edb9f498f7148a0d6b2c232a8c22412e113c422b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit fcd3989eab76fcc779343df11328565ad77446f4
Author: Henry Bolshaw <bolshawh at parliament.uk>
Date:   Wed May 22 15:02:40 2019 +0000

    Bug 22965: fixes typo on classification sources description on admin homepage
    
    Removed comma from description.
    
    Test plan:
    1. Go to Admin homepage
    2. Check Classification Sources description
    3. Verify that comma after i.e. has gone removed
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit b67462d471a54bf342295cbc5e46373d065bab7e)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 7aa7ca51f275acb3b46d290e700bf9fdba743070
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon May 27 09:39:34 2019 +0000

    Bug 15221: (QA follow-up) Fix Message.t
    
    As Jonathan reported on comment11, SIP/Message.t fails now.
    
    This is a trivial fix for that. In the first case we should just no longer
    expect the alert flag. In the second case it makes more sense to toggle
    the value of the checked_in_ok setting.
    
    Test plan:
    Run t/db_dependent/SIP/Message.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 533ff7ab29a1ca6d35d0e306dd97273838ad3064)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f11eaf3cbf6d35af6c49d9384b0c086cb457b901
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue May 21 11:12:44 2019 +1000

    Bug 15221: SIP server always sets the alert flag when item not returned
    
    The checked in response from the ACS always has the alert bit set to
    true, even when using the checked_in_ok option.
    
    This patch sets the alert bit to 0 when checked_in_ok is used and
    the item is checked in without a preceding checkout.
    
    To test:
    
    0) Create patron in web interface with a cardnumber and userid of "staff" with a password
    that matches the account in SIPconfig.xml. Also set their branch to CPL
    (also matching SIPconfig.xml).
    1) Create an item with a barcode of 'test'
    2) Choose a patron to check out to and record their borrowernumber
    
    In one terminal:
    3) cd to your git directory (e.g. /home/koha/koha)
    4) perl ./C4/SIP/SIPServer.pm ~/koha-dev/etc/SIPconfig.xml
    
    In another terminal:
    5) cd to your git directory (e.g. /home/koha/koha)
    6) perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    NOTE: You need to replace <borrowernumber> with the borrowernumber from Step 2, and <password> with the password from Step 0.
    
    Before patch:
    
    koha at 9ec653ab82ce:~/koha$ perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    Attempting socket connection to localhost:6001...connected!
    SEND: 9300CNstaff|COStaff1|CPCPL|
    READ: 941
    
    Trying 'checkin'
    SEND: 09N20190521    00310320190521    003103APCPL|AOCPL|ABtest|AC<password>|BIN|
    READ: 101YNY20190521    003106AOCPL|ABtest|AQCPL|AJTest|
    
    After patch:
    koha at 9ec653ab82ce:~/koha$ perl ./misc/sip_cli_emulator.pl -l CPL -su staff -sp <password> --port=6001 --address=localhost --item test -m checkin --patron <borrowernumber>
    Attempting socket connection to localhost:6001...connected!
    SEND: 9300CNstaff|CO<password>|CPCPL|
    READ: 941
    
    Trying 'checkin'
    SEND: 09N20190521    01000020190521    010000APCPL|AOCPL|ABtest|AC<password>|BIN|
    READ: 101YNN20190521    010004AOCPL|ABtest|AQCPL|AJTest|
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit d963a3854c962bda3361213f2ad8e7626311d20b)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit d8519050bc303ab2e3fe1a0f3e715cf7fabe43a0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Dec 7 14:43:18 2018 -0300

    Bug 21831: Allow move all fields even if destination field is different
    
    Tests exist in t/SimpleMARC.t to prove that it works and it is possible.
    I do not remember what I wrote this limitation.
    
    Signed-off-by: Jon Knight <j.p.knight at lboro.ac.uk>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 189bde4a1d043a25a0eddcc07401b7946653c3b1)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 C4/MarcModificationTemplates.pm                    |    3 ---
 C4/SIP/ILS.pm                                      |    1 +
 C4/Search.pm                                       |    1 -
 C4/Suggestions.pm                                  |    7 +++----
 .../prog/en/modules/admin/admin-home.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   22 +++++++++++---------
 opac/opac-issue-note.pl                            |    1 +
 t/db_dependent/SIP/Message.t                       |    2 +-
 t/db_dependent/Suggestions.t                       |    9 +++++++-
 9 files changed, 27 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list