[koha-commits] main Koha release repository branch 19.11.x updated. v19.11.06-11-gcbe1b8bb57

[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, 19.11.x has been updated
       via  cbe1b8bb5706b17e60034c35107d91b170f14ce2 (commit)
       via  29e53d6f734dcf0e5b072980d2f53b65d1c75e05 (commit)
       via  40096821f38c122dfb35b64093da08f774c479fd (commit)
      from  bcfffea6986c65d712d79e12fe1c099a1f2bbccb (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 cbe1b8bb5706b17e60034c35107d91b170f14ce2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Apr 13 13:42:02 2020 +0200

    Bug 24612: Use the reserve_id to identify a reserve when building a notice
    
    Now that we have the reserve_id PK on the reserves table we should use
    it (instead of the couple borrowernumber, biblionumber)
    
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit aa1f0fd73fa2a8dadd86ef5defc390e164845429)
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

commit 29e53d6f734dcf0e5b072980d2f53b65d1c75e05
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Apr 13 13:10:55 2020 +0200

    Bug 24612: Add tests
    
    ReserveSlip call need to be adjusted in test.
    We also add a new reserve (same biblio, same patron) to highlight the problem.
    
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit e9e8b635e14fe1229006b556e8aa0babf61455c7)
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

commit 40096821f38c122dfb35b64093da08f774c479fd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 12 10:02:56 2020 +0100

    Bug 24612: Make hold-transfer-slip take reserve_id
    
    To make sure we are going to display the correct hold's info we need to
    pass the reserve_id.
    
    == Test plan ==
    1. Add some content to HOLD_SLIP notice, e.g.
    
      <h2>[% branch.branchname %]</h2>
      <div>[% biblio.author %]<br>[% biblio.title %]<br>[% item.barcode %]
      <ul><li> Reserve ID:  [% hold.reserve_id %]</li>
      <li>Expiration date: [% hold.expirationdate %]</li></ul>
    
    2. Add 2 holds for 1 patron to a single record
    3. Check the reserve IDs in the reserves table - on a clean sandbox, they will be 1 and 2
    4. Check in one of the items from the record and print the slip
    5. Note that the reserve ID on the slip is 2 and the expiration date is blank
    6. Repeated check ins do not change this
    7. Check in a second item from the record
    8. Note that the reserve ID for this hold is also 2, but this time the expiration date is filled in
    9. Check in the first item again - the reserve ID stays as 2, but this time the expiration date is filled in
    10. Apply patch
    11. cancel the holds to come back to a clean state
        (and maybe ensure items aren't in transit)
    12. redo the test and see the following differences
    13. 1st checkin:
        1. expiration date ok
        2. the reserve ID is the one of the first hold
    14. 2nd checkin:
        1. expiration date ok
        2. the reserve ID is the one of the second hold
    
    Signed-off-by: Victor Grousset/tuxayo <victor at tuxayo.net>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit d864c5640a3e3b02cbb64bde034935fa746a09ce)
    Signed-off-by: Aleisha Amohia <aleishaamohia at hotmail.com>

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

Summary of changes:
 C4/Circulation.pm                                  |  2 ++
 C4/Letters.pm                                      |  2 +-
 C4/Reserves.pm                                     | 36 ++++------------------
 circ/circulation.pl                                |  3 +-
 circ/hold-transfer-slip.pl                         | 10 ++----
 circ/returns.pl                                    | 11 ++-----
 .../prog/en/modules/circ/circulation.tt            |  4 +--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |  4 +--
 t/db_dependent/Letters/TemplateToolkit.t           | 17 +++++-----
 9 files changed, 28 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
main Koha release repository