[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.13-3-g050bdad331

[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.11.x has been updated
       via  050bdad3311040ee13736a52fa6741a337f96684 (commit)
       via  34dee35999f79b378518e04b70b591ede51c29f4 (commit)
      from  43a1e7600dda1c2612f33e2198fc160f6fa11b09 (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 050bdad3311040ee13736a52fa6741a337f96684
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Dec 23 16:19:47 2019 +0100

    Bug 24277: Fix date received editing when receiving an order
    
    Bug 8417 added the ability to edit the date received, but a merge
    conflict was wrongly resolved during a rebase of
      commit 20d9ed618fbe3cdcb9c04444a1f8a584b0364069
      Bug 13321: Rename variables
    
    Test plan:
    Create an order
    Receive it
    Set a date (different from today)
    => The date you picked should have been set in DB for the order
    
    Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 028a77abce1aa0c9dc9f1bab8fc3069df811c2a1)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit a273c604db5ebad8aef2b1076a0a5870783ba06e)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

commit 34dee35999f79b378518e04b70b591ede51c29f4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jan 8 10:55:40 2020 -0300

    Bug 24277: Regression tests
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 76f7c46613687b712fa2342049557f2a769db8bf)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    (cherry picked from commit b57a0462ecf12c1353d8650febf6feab89e4ff60)
    Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>

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

Summary of changes:
 C4/Acquisition.pm            | 12 ++++++++++--
 acqui/finishreceive.pl       |  1 +
 t/db_dependent/Acquisition.t | 26 ++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository