[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.10-46-g9444691

[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, 17.11.x has been updated
       via  94446917946de314302345f0b28503fcbea38c70 (commit)
       via  13c7f876c0935f048eba41b852722342f3c520b8 (commit)
      from  d9d868b911d1ba18c2bac1993e407168164df168 (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 94446917946de314302345f0b28503fcbea38c70
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Aug 13 13:23:00 2018 -0300

    Bug 21176: Fix due date calculation when high holds and TimeFormat is 12hr
    
    What we were doing was wrong and is still wrong. The output_pref should not be done
    in modules or script, only template side.
    Much more work would be needed to clean the situation. This patch provides less changes
    as possible to, hopefully, not introduce side-effects.
    
    To recreate:
    1 - Enable decreaseLoanHighHolds, set to 1 day and more than 0 holds
    2 - Set TimeFormat to 12 hour
    3 - Find or create a record with two items
    4 - Place a hold on one of them
    5 - Checkout the other to a different patron
    6 - Note the warning message display correct time
    7 - Confirm the checkout
    8 - Note the item is due at 11:59AM
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 11885e75c04fa53cd88daae1ec0dc4a2a8ecd1f7)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 1d8a66ad010247c90a8930f4d2b48f96bbfe3b7e)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 13c7f876c0935f048eba41b852722342f3c520b8
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Sep 27 12:29:08 2018 +0100

    Bug 19271: Show vendor name on ordered/spent lists
    
     Improvements to the display of lists of ordered and received orders:
     - Show the vendor's name instead of the internal number
    
     To test:
     - Make sure you have some pending and received orders
     - Access the Spent and Ordered pages by clicking on the
       amount ordered or spent on the acq start page
       - Verify that
         - Vendor name shows
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 8b1bda9ed8507745b4002199d9aae95c2cbb31fb)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 3e77e7a4d6c90e6a14d152af19c46cda6486e7ac)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 C4/Circulation.pm                                           |    4 ++--
 acqui/ordered.pl                                            |    3 +++
 acqui/spent.pl                                              |    5 ++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    4 ++--
 6 files changed, 13 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository