[koha-commits] main Koha release repository branch master updated. v3.20.00-145-g4d417b9
Git repo owner
gitmaster at git.koha-community.org
Thu Jun 11 16:19:21 CEST 2015
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 4d417b9a2ea278ad203beb6e90f7da4d79f487df (commit)
via 1f3e11c5bd64f46511d2632b7e9d5862f75b2e25 (commit)
via 99df63b4b032e526c3a57da316e08d896b68ce00 (commit)
via ca17301881792940bba6a3de99693a0384d47f29 (commit)
via 074f8637e8bccabe2edeb3bd8e1584cede914387 (commit)
via 04052875380bd113c146279b675f57fa60d1088d (commit)
via 57608fdecb2503088a8d02717fd992e84c849d28 (commit)
from 27ef1410a7784577149bed6a466937c7ded6ba70 (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 4d417b9a2ea278ad203beb6e90f7da4d79f487df
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date: Thu Jun 11 10:29:06 2015 -0300
Bug 7981: DBRev 3.21.00.008
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 1f3e11c5bd64f46511d2632b7e9d5862f75b2e25
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date: Tue May 26 11:55:56 2015 +0200
Bug 7981: Reintroduce dropboxdate
The parameter was lost in previous commit.
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 99df63b4b032e526c3a57da316e08d896b68ce00
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 20 06:39:33 2015 -0400
Bug 7981: (QA followup) Rename TT vars
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit ca17301881792940bba6a3de99693a0384d47f29
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Apr 21 11:56:16 2015 +0200
Bug 7981: Follow-up - Fix qa script complaints
- Fix updatedatabase, moving the update entry into the right spot
- Fix some tabs
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 074f8637e8bccabe2edeb3bd8e1584cede914387
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 13 13:21:49 2015 +0200
Bug 7981: Use The Branches TT plugin instead of GetBranchName
Note that homebranchname is never used in the template.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 04052875380bd113c146279b675f57fa60d1088d
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Apr 13 13:21:41 2015 +0200
Bug 7981: Remove HomeOrHoldingBranchReturn syspref from C4::UsageStats
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
commit 57608fdecb2503088a8d02717fd992e84c849d28
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date: Thu Mar 5 16:09:00 2015 +0100
Bug 7981: Remove HomeOrHoldingBranchReturn syspref
This patch removes HomeOrHoldingBranchReturn syspref and makes circ/returns.pl respect branch
circulation rules from C4::Circulation::GetBranchItemRule. Also transfer slip notice should reflect this.
Default should always be to return item to home branch.
Test plan:
- make sure syspref 'AutomaticItemReturn' is set to 'false'
- unset 'Default checkout, hold and return policy' or set 'Return policy' to 'Item returns home'
- checkout an item and do a checkin from different branch than items homebranch
- verify that you're prompted with a transfer message to item's home branch and that print slip matches
- set 'Return policy' to 'Item returns to issuing library'
- do a checkout and a checkin from branch different than item's home branch
- verify that you're not prompted with a transfer message and that holding library is your current branch
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Follow-up:
- Added 3 tests in t/db_dependent/Circulation_Branches.t to test AddReturn
policies
- Removed HomeOrHoldingBranchReturn from sysprefs.sql
- Added notice on removing syspref in updatedatabase
QA edits:
- removed trailing whitespace in tests
- moved branchname lookup from returns.pl to template
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 35 +++---
C4/UsageStats.pm | 1 -
Koha.pm | 2 +-
circ/returns.pl | 16 ++-
installer/data/mysql/sysprefs.sql | 1 -
installer/data/mysql/updatedatabase.pl | 10 ++
.../en/modules/admin/preferences/circulation.pref | 7 --
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 10 +-
t/db_dependent/Circulation_Branch.t | 124 +++++++++++++++++---
9 files changed, 153 insertions(+), 53 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list