[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-70-g18d0488

[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, 18.05.x has been updated
       via  18d04888b2264ab85a24290c51eed01c051418ce (commit)
       via  f0937049f376d829d6baad81c66c298e93587acf (commit)
       via  c2537558e0ed79cc00a71d7405b7e738835372a8 (commit)
       via  d0db6f69bbc38b943dd723eca05f181de1a60cf8 (commit)
      from  8a7b508cf4bfb9ed03259139c8819a7011995bf5 (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 18d04888b2264ab85a24290c51eed01c051418ce
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Oct 9 11:30:23 2018 +0000

    Bug 21417: DBRev 18.05.04.002
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit cf8890465d32d780e4177438d9b6ae807b1df36d)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit f0937049f376d829d6baad81c66c298e93587acf
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Sep 27 16:07:37 2018 +0100

    Bug 21417: (QA follow-up) Display default EAN as such in admin display
    
    A branch value of null is interpreted as the default
    Add text 'All libraries' to this case in the display
    rather than blank so that its function is clear to the
    user
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.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 d70daacebae50fde8449f4cec2bb4578747610fc)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit c2537558e0ed79cc00a71d7405b7e738835372a8
Author: Kyle M Hall <kyle at bywatersolutiosn.com>
Date:   Thu Sep 27 06:51:27 2018 -0400

    Bug 21417: EDI ordering fails when basket and EAN libraries do not match
    
    When clicking Create EDIFACT Order on /acqui/basket.pl, an EDIFACT message will not be generated if aqbasket.branch does not match edifact_ean.branchcode. This failure does not generate any sort of error message, it just fails to produce a message.
    
    We should allow ean's to not require a branch to be set, then if we don't find a branch specific each, we can look for the default version of the ean.
    
    Test Plan:
    1) Apply this patch set
    2) Run updatedatabase
    3) Verify you can create a Library EAN without setting a branchcode for it
    4) Verify you can use this EAN to send an EDI order where the basket has a branchcode set
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.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 18674cfde322c52fafb3114b397bb1ebe7941b97)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit d0db6f69bbc38b943dd723eca05f181de1a60cf8
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sat Sep 29 19:51:45 2018 +0300

    Bug 21455: Authority search options get shuffled around when you click on 'Search'
    
    In the staff client, when you perform an authority search the
    selected values for the 'Search all headings:' and 'Search
    entire record:' options get shuffled around when you click on
    the 'Search' button.
    
    This patch fixes that.
    
    Test plan:
    1) Perform an authority search and set the 'Search all headings:'
       option to 'starts with'.
    2) Click on the 'Search' button.
    3) Notice how the 'Search all headings:' option is now 'contains',
       and 'starts with' has moved down to the 'Search entire record:'
       option.
    4) Apply the patch.
    5) Hit 'Search' again. This time the selected search options do
       not move around.
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 6cee98c04fce2129de21c65c9e0c407a508df9bd)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 Koha.pm                                                 |    2 +-
 Koha/EDI.pm                                             |   10 ++++++++++
 Koha/Schema/Result/EdifactEan.pm                        |   15 ++++++++++-----
 admin/edi_ean_accounts.pl                               |    4 ++--
 authorities/auth_finder.pl                              |   14 ++++++--------
 installer/data/mysql/kohastructure.sql                  |    2 +-
 installer/data/mysql/updatedatabase.pl                  |    7 +++++++
 .../prog/en/modules/admin/edi_ean_accounts.tt           |   11 ++++++++---
 8 files changed, 45 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
main Koha release repository