[koha-commits] main Koha release repository branch master updated. v16.05.00-1297-ge67c202
Git repo owner
gitmaster at git.koha-community.org
Wed Nov 2 11:54:57 CET 2016
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 e67c20260948ea974a828ec99a77b9840bbddec7 (commit)
via 85e95d069d8c072fec355e3c18bd59333e9618f9 (commit)
via e3387862fb19f08d6f1a3cb4f4fbb9b632170986 (commit)
via 6e2caf74f85e5d6ea5df8042431a4ade06b60633 (commit)
via 15b1f6c7fe472ce4b1c0f73e2f0dbb0fe05a15ad (commit)
via 53dfa997276348f70c2924bc588b3668f2dfb519 (commit)
from 81eec722da04a0071a5680439a81472ea796c3fc (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 e67c20260948ea974a828ec99a77b9840bbddec7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Nov 2 10:53:35 2016 +0000
Bug 15581 - DBRev 16.06.00.046
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 85e95d069d8c072fec355e3c18bd59333e9618f9
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Tue Nov 1 15:53:05 2016 +0100
Bug 15581: Follow-up - suggested change to the OPAC message
Instead of showing "Automatic renewal" to the user, this
changes it to show "No longer renewable" when the
automatic renewal won't happen any longer because of the
days the item has already been checked out.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit e3387862fb19f08d6f1a3cb4f4fbb9b632170986
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Oct 28 16:08:01 2016 +0000
Bug 15581: Change wording for auto too late
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 6e2caf74f85e5d6ea5df8042431a4ade06b60633
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 18 16:33:42 2016 +0100
Bug 15581: Display the generic "schedule for auto renew" message on the checkouts table
Signed-off-by: Jonathan Field <jonathan.field at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 15b1f6c7fe472ce4b1c0f73e2f0dbb0fe05a15ad
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Jan 14 14:38:23 2016 +0000
Bug 15581: Display the latest auto renew date possible when renewing manually
If an issue marked as auto_renew is renewed manually, we want to display
the latest auto renew date possible.
Test plan:
1/ Define circ rules as in the previous patch.
2/ Check a item out, mark it as an auto renewal
3/ Back date the issuedate and make sure it will be too late to renew it
4/ Use the Circulation > renew page (circ/renew.pl) to manually renew
this issue.
You should get a warning "You barcode has been scheduled for automatic renewal
and cannot be renewed anymore since DATE."
If the pref AllowRenewalLimitOverride is set, you will be allowed to
renew it anyway.
Sponsored-by: University of the Arts London
Signed-off-by: Jonathan Field <jonathan.field at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 53dfa997276348f70c2924bc588b3668f2dfb519
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Jan 13 19:17:49 2016 +0000
Bug 15581: Add a circ rule to limit the auto renewals given a delay
This patch adds a new circulation rule (no_auto_renewal_after) to block/allow
auto renewals after a given delay.
For instance, if the issue date is 10 days before today, and
no_auto_renewal_after is set to 10, tomorrow the issue won't be auto
renewed.
Test plan:
0/ Execute the update DB entry
Note: You will have to manually change data in your DB, make sure you
have access to the sql cli.
1/ Define a rule with no_auto_renewal_after (10 for instance) and
norenewalbefore (5 for instance).
(This new rule will behave the same as norenewalbefore: the unit depends
on the lengthunit value).
The automatic renewals will be done from 5 to 10 days ahead.
2/ Modify the issues.issuedate, to simulate a checkout in the past:
UPDATE issues
SET issuedate = "yyyy-mm-dd hh:mm:ss"
WHERE itemnumber = YOUR_ITEMNUMBER;
with issuedate = 2 days before for instance
3/ Execute the automatic renewals cronjob script (misc/cronjobs/automatic_renewals.pl)
Confirm that the issue has not been renewed (too soon)
4/ Repeat step 2 with a due date set as 11 days before
5/ Execute the automatic renewals cronjob script (misc/cronjobs/automatic_renewals.pl)
Confirm that the issue has not been renewed (too late)
6/ Repeat step 2 with a due date set as 7 days before
7/ Execute the automatic renewals cronjob script (misc/cronjobs/automatic_renewals.pl)
Confirm that the issue has been renewed (issues.renewals has been
incremented and date_due has been updated according your circ rules).
Sponsored-by: University of the Arts London
Signed-off-by: Jonathan Field <jonathan.field at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 68 ++++++++++++++++-
Koha.pm | 2 +-
Koha/Schema/Result/Issuingrule.pm | 11 ++-
admin/smart-rules.pl | 3 +
circ/renew.pl | 9 ++-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 10 +++
.../intranet-tmpl/prog/en/includes/strings.inc | 1 +
.../prog/en/modules/admin/smart-rules.tt | 4 +
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 +++
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 7 ++
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +
opac/opac-user.pl | 1 +
t/db_dependent/Circulation.t | 78 +++++++++++++++++++-
14 files changed, 202 insertions(+), 7 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list