[koha-commits] main Koha release repository branch master updated. v16.11.00-1010-g7130d55
Git repo owner
gitmaster at git.koha-community.org
Tue May 9 15:18:06 CEST 2017
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, master has been updated
via 7130d554584b7ab4f4480399f5d29a90d0aef3d6 (commit)
via 07de44bcd1e42bfb82f1da89758783b26e79cbf8 (commit)
via 2144fecdf06a484cb1047d3bbdd84b66d16e1805 (commit)
via a08b309c4f7fc9714a660e4422fdf1f2b7f65dd6 (commit)
via 342baadde51494a39c020715e83777838a933485 (commit)
via 26634151dbce0bf39ff6c9eda5b58bb993996a2d (commit)
via 6add80083b1f8596496d13569347818ed8ce71a9 (commit)
via 8fc77442585d28b11dc0ed2fd4f99e190db47c35 (commit)
via d477cc24f66938abf2503f871043378b10460475 (commit)
via 7cf3c12f5bd2a4a4acb7162e7b3297dbe492350e (commit)
from 89c0ecef47e34f151e10ebfb2e3cc927ecaa93f3 (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 7130d554584b7ab4f4480399f5d29a90d0aef3d6
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue May 9 09:16:49 2017 -0400
Bug 12063 - DBRev 16.12.00.032
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 07de44bcd1e42bfb82f1da89758783b26e79cbf8
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 4 14:15:51 2017 +0200
Bug 12063: [QA Follow-up] Small change of two test scripts
Removing dbh from one script, changing rollback in the other.
Schema is leading now.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 2144fecdf06a484cb1047d3bbdd84b66d16e1805
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu May 4 12:53:03 2017 +0200
Bug 12063: [QA Follow-up] Adjustments to db revision
Replace use by require.
Add require Koha::Calendar (seriously needed to prevent crashing).
Base expirationdate on today not on waitingdate (just as in Reserves).
Remove if ( waitingdate ) construction. Not needed anymore.
Remove $cancel_on_holidays. Not used. Note that the if construction around
the new pref is not strictly needed at upgrade time (pref still zero).
Fill the dbrev description.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit a08b309c4f7fc9714a660e4422fdf1f2b7f65dd6
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu May 4 08:54:16 2017 +0000
Bug 12063 - Remove checking of ExpireReservesMaxPickUpDelay in CancelExpiredReserves(). Koha::Hold::set_waiting calculate expiration date from today instead of hold's waiting date.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 342baadde51494a39c020715e83777838a933485
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Apr 20 14:22:25 2017 +0000
Bug 12063 - make perl atomic update follow skeleton.perl
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 26634151dbce0bf39ff6c9eda5b58bb993996a2d
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Mar 30 09:53:10 2017 +0000
Bug 12063 - Fix QA failures
- Remove expiration date calculation in C4::Letter since it's done
when setting the reserve waiting,
- remove expiration date calculation in circ/waitingreserves.pl. Use
the one in DB,
- add a new atomic update that calculate expiration date for
waiting reserves,
- add tests for days_foward function and fix the infinite loop.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6add80083b1f8596496d13569347818ed8ce71a9
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Mar 22 12:55:49 2017 +0000
Bug 12063 - Fix unit tests
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8fc77442585d28b11dc0ed2fd4f99e190db47c35
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Wed Jan 18 14:13:33 2017 +0000
Bug 12063 - Keep patron's requested expiration date if it is prior to the calculated one
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace at sub.su.se>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit d477cc24f66938abf2503f871043378b10460475
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Thu Jun 30 10:00:26 2016 +0200
Bug 12063 - Remove Koha::Hold::waiting_expires_on since dateexpiration is set on database
Signed-off-by: sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 7cf3c12f5bd2a4a4acb7162e7b3297dbe492350e
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Mon Jun 20 11:52:37 2016 +0200
Bug 12063: Change date calculation for reserve expiration to skip all holiday
This patch makes koha automatically set expiration date when reserves become
waitting. Also it adds a new syspref "ExcludeHolidaysFromMaxPickUpDelay" that allows to
take holidays into account while calculating expiration date.
Test plan:
- Install this patch and run updatedatabase.pl script,
- allow ExpireReservesMaxPickUpDelay in system preferences,
- set ReservesMaxPickUpDelay to 5.
- Place an hold on a checked out item and check in this item:
The hold's expiration date should be today + 5.
- Allow ExcludeHolidaysFromMaxPickUpDelay in system preferences,
- add holiday during this pickup delay period,
- Create a new hold and make it comes waitting:
The hold's expiration date should be today + 5 + number of closed
day(s).
Also:
- Check that ExpireReservesOnHolidays syspref works again
without ExcludeHolidaysFromMaxPickUpDelay.
- Check that cancel fees apply again if wanted.
Signed-off-by: sonia BOUIS <sonia.bouis at univ-lyon3.fr>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 10 -
C4/Reserves.pm | 68 ++----
Koha.pm | 2 +-
Koha/Calendar.pm | 16 ++
Koha/Hold.pm | 52 +++--
circ/waitingreserves.pl | 9 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 35 +++
.../en/modules/admin/preferences/circulation.pref | 6 +
.../prog/en/modules/circ/circulation.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 +-
reserve/request.pl | 1 -
svc/holds | 5 -
t/db_dependent/Calendar.t | 69 ++++++
t/db_dependent/Hold.t | 14 +-
t/db_dependent/Holds.t | 39 +---
t/db_dependent/Holds/CancelReserves.t | 98 ++++++++
t/db_dependent/Holds/WaitingReserves.t | 244 ++++++++++++++++++++
19 files changed, 529 insertions(+), 156 deletions(-)
create mode 100644 t/db_dependent/Calendar.t
create mode 100644 t/db_dependent/Holds/CancelReserves.t
create mode 100644 t/db_dependent/Holds/WaitingReserves.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list