[koha-commits] main Koha release repository branch master updated. v16.11.00-693-ge83d92a
Git repo owner
gitmaster at git.koha-community.org
Fri Mar 31 14:45:04 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 e83d92a713e2deea3081a4ff8caa0d63ea66d8c8 (commit)
via 8639a64bdb35cf9b28baceffb22cc81394dd8db2 (commit)
via 14a78a8c5201ad2e4306ed0202007820e1409bb3 (commit)
via 703b97f22d62ac7d25981a0449196fbe5b90aec1 (commit)
via e1dce7dd5b1d62671d8d59055f832fcae1a26260 (commit)
via ac30cc82492b11ab99020bd555b5e20ebb6c2a23 (commit)
via ecf5dcdbfad35dbdf81843274049113907620a10 (commit)
via 24d6de661af1e414e8deaa1e61cff511d570d2cf (commit)
via 041a04282ae1c7e2a187760265ab639e1139cab7 (commit)
via 87afa5142bd12c0d5ff630dbf27d8703ca0ea131 (commit)
via 42d110a774b65549241e191882f87a89fc312329 (commit)
from 6831dd5977086ea869516bfdce995a7cd2b921ef (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 e83d92a713e2deea3081a4ff8caa0d63ea66d8c8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Feb 3 10:45:13 2017 +0100
Bug 17736: Fix typo ->new vs ->next
while ->new is terrible, let's call that a typo...
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
opac-detail works again !
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 8639a64bdb35cf9b28baceffb22cc81394dd8db2
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 13:36:35 2017 +0100
Bug 17736: [QA Follow-up] Script basket.pl is not Plack compliant
Several warnings like:
Variable "$confirm_pref" is not available at /usr/share/koha/masterclone/acqui/basket.pl line 507.
Primarily caused by sub edi_close_and_order.
Easy fix.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 14a78a8c5201ad2e4306ed0202007820e1409bb3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 13:22:07 2017 +0100
Bug 17736: [QA Follow-up] We do not need GetItemHolds in acqui
The solution of Jonathan can be applied in two other cases, effectively
making GetItemHolds obsolete.
Test plan:
[1] Git grep on GetItemHolds
[2] Add an order, place a hold, delete order.
[3] Add an order, receive, place hold, delete order.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 703b97f22d62ac7d25981a0449196fbe5b90aec1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 12:21:56 2017 +0100
Bug 17736: [QA Follow-up] Crashes in basket.pl and parcel.pl
Crash in basket.pl:
Can't call method "holds" on an undefined value at /usr/share/koha/masterclone/acqui/basket.pl line 466.
Comes from a biblionumber == NULL in aqorders where I cancelled the order and deleted the biblio.
Crash in parcel.pl:
Can't call method "holds" on an undefined value at /usr/share/koha/masterclone/acqui/parcel.pl line 246.
Similar fix.
Trivial fixes indeed.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit e1dce7dd5b1d62671d8d59055f832fcae1a26260
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 12:03:27 2017 +0100
Bug 17736: [QA Follow-up] Wrong biblionumber in acqui/parcel
Trivial fix.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ac30cc82492b11ab99020bd555b5e20ebb6c2a23
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 11:45:17 2017 +0100
Bug 17736: [QA Follow-up] Solve warning from qa tools on Holds.t
FAIL t/db_dependent/Holds.t
"my" variable $hold masks earlier declaration in same scope
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit ecf5dcdbfad35dbdf81843274049113907620a10
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 11:21:10 2017 +0100
Bug 17736: [Follow-up] Resolve inherited AUTOLOAD for non-method errors
Like:
Use of inherited AUTOLOAD for non-method Koha::Biblio::GetMarcBiblio() is deprecated at /usr/share/koha/masterclone/Koha/Biblio.pm line 60.
Use of inherited AUTOLOAD for non-method Koha::Biblio::GetRecordValue() is deprecated at /usr/share/koha/masterclone/Koha/Biblio.pm line 60.
Resolved by not importing them but fully qualifying them.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 24d6de661af1e414e8deaa1e61cff511d570d2cf
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jan 6 10:48:48 2017 +0100
Bug 17736: [Follow-up] Rename to current_holds
It is not about when the hold was 'placed' but if the hold pertains to
the future or not.
Test plan:
[1] Git grep on holds_placed_before_today.
[2] Run t/db_dependent/Koha/Biblios.t
[3] Run t/db_dependent/Reserves.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 041a04282ae1c7e2a187760265ab639e1139cab7
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 7 12:26:53 2016 +0100
Bug 17736: Remove C4::Reserves::GetReservesFromBiblionumber
At this point, there should not be any occurrences of
GetReservesFromBiblionumber left in the codebase
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 87afa5142bd12c0d5ff630dbf27d8703ca0ea131
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 7 02:29:01 2016 +0000
Bug 17736: Replace GetReservesFromBiblionumber with Koha::Biblio->holds
The C4::Reserve::GetReservesFromBiblionumber took 3 parameters, the
biblionumber, an optional itemnumber and a "all_dates" flag.
If set, the subroutine returned all the holds placed on a given bibliographic
record, even the ones placed in the future. Almost all of the calls had this
flag set, they will be replaced with a call to Koha::Biblio->holds.
But 5 did not have it:
- C4::Biblio::DelBiblio
-tools/batch_delete_records.pl
=> These 2 were wrong, we want to retrieve the holds to cancel them
before deleting the record. We need to get all the holds, even the ones
placed in the future /!\ CHANGE IN THE BEHAVIOR
- acqui/parcel.pl
=> 1 call per item were made to this subroutine. They have been replaced
with only 1 call to the new method Koha::Biblios->holds_placed_before_today
Then we filter on the itemnumbers.
I think this is wrong: we need the number of holds to know if the record
can be deleted, so even if future holds exist, the deletion should not
be possible.
- serials/routing-preview.pl
- C4::ILSDI::Services::GetRecords
- C4::SIP::ILS::Item->new
=> Seems ok, we just one to display holds placed before today
Test plan:
I would suggest to test this patch with patches from bug 17737 and bug 17738,
to place different kind of holds (biblio and item level, future and
past).
Then do a whole workflow to detect bug, view a record, delete record,
order, place a hold on an item which has been ordered, etc.
The hold's informations should always be the same without or without
these patches.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
commit 42d110a774b65549241e191882f87a89fc312329
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 7 16:38:38 2016 +0100
Bug 17736: Add the Koha::Biblio->holds_placed_before_today method
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 8 ++-
C4/ILSDI/Services.pm | 8 ++-
C4/Items.pm | 22 -------
C4/Reserves.pm | 67 --------------------
C4/SIP/ILS/Item.pm | 12 ++--
Koha/Biblio.pm | 27 ++++++--
acqui/basket.pl | 21 +++---
acqui/parcel.pl | 20 +++---
catalogue/ISBDdetail.pl | 6 +-
catalogue/MARCdetail.pl | 6 +-
catalogue/detail.pl | 6 +-
catalogue/imageviewer.pl | 6 +-
catalogue/labeledMARCdetail.pl | 6 +-
catalogue/moredetail.pl | 8 +--
.../prog/en/modules/tools/batch_delete_records.tt | 4 +-
opac/opac-detail.pl | 18 +++---
opac/opac-reserve.pl | 10 +--
serials/routing-preview.pl | 27 ++++----
t/db_dependent/Holds.t | 29 +++++----
t/db_dependent/Koha/Biblios.t | 15 ++++-
t/db_dependent/Reserves.t | 25 ++++----
t/db_dependent/UsageStats.t | 7 +-
tools/batch_delete_records.pl | 19 ++++--
23 files changed, 160 insertions(+), 217 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list