[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.11-36-gaf21725

[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  af21725edaf4342bbf6a8883f08426b41fc6f09b (commit)
       via  bf09bf5826c4bb8ad2d77456b843c321b3bffe37 (commit)
      from  531ee472234942f1c63ab10745551af8e3eddbf8 (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 af21725edaf4342bbf6a8883f08426b41fc6f09b
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Apr 4 00:56:43 2019 +0000

    Bug 21659: Change link to basket group edit page
    
    I have taken another look at other links like the one
    from acq order search and changed the link to not lead
    to the vendor's basket group page but to the edit page
    of the invidividual basket group.
    
    To test:
    - Same as first patch, verify links now lead
      to the basket grou edit page
    
    https://bugs.koha-community.org/show_bug.cgi?id=21650
    
    Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos 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 9cbc5f2aa072ec41a70fd1fa1de4f684fcd695e9)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b1628abb3e3262f0eb712236f44991b7bb1799a9)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit bf09bf5826c4bb8ad2d77456b843c321b3bffe37
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Mon Mar 11 16:24:16 2019 +0000

    Bug 21659: Fix links to basket groups from order receive page
    
    Fixes a problem with the template variables on the order
    receive page, so that the links to basket groups work
    correctly again.
    
    To test:
    - Create some orders with and without basket groups
    - Receive shipment
    - Verify that the basket group links for pending orders work right
    - Receive an order line
    - Verify that the basket group links for received orders work right
    
    Signed-off-by: Jose-Mario Monteiro-Santos <jose-mario.monteiro-santos 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 3db5feb900d3e6a6400767c771afe78bab0fa880)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 6f1738121355fed39b7c9440e3ed47a05788987e)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository