[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-53-g2b37db0
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 8 10:55:29 CEST 2018
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, 18.05.x has been updated
via 2b37db0d7dfd6375621edcdbc83e740d3f2f8407 (commit)
via 78ffca5f32d82b72edb07a6d058a623c41b712dd (commit)
via 261e30f3e484fe3d49848fb60ea2cc7fbee88885 (commit)
via b2cf26de21db3055df7d9426dff9860c2bdad8bf (commit)
via b3ab0a723a23cb59c241339fa122dae75689c7b0 (commit)
via 23542b6d310695aa7f0f967cdb4c6bd6273be40b (commit)
from 1d8a66ad010247c90a8930f4d2b48f96bbfe3b7e (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 2b37db0d7dfd6375621edcdbc83e740d3f2f8407
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 18:05:44 2018 -0300
Bug 21432: (bug 20899 follow-up) Fix patron's name display for deleted patrons
Template process failed: undef error - DBIC result _type isn't of the
_type Borrower at
/home/vagrant/kohaclone/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt
line 54.
Koha::Old::Checkout->patron should return undef if the patron record has
been removed.
Test plan:
- Check 2 items out on the same bibliographic record
- Check them in
- Delete the patron's record of one of the issuer (Is this word really
exist?)
- View the checkout history for this bib record (Home › Catalog ›
Checkout history)
=> Without this patch you get the error
=> With this patch applied one of the "Patron" cells will be empty
Signed-off-by: Claudio <costalc at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 7fbd50e3aa07e46f0558d4f52231896937c998bc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 78ffca5f32d82b72edb07a6d058a623c41b712dd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 1 11:38:04 2018 -0300
Bug 21385: Define the Koha object class for orders
It fixes the following issue:
t/db_dependent/Acquisition/GetBasketsInfosByBookseller.t .. 1/40 Can't
locate object method "_new_from_dbic" via package "Koha::Aqorder"
(perhaps you forgot to load "Koha::Aqorder"?) at
/home/vagrant/kohaclone/Koha/Object.pm line 230.
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 b3dee0daf29c4593aee2781307853845a6cd3735)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 261e30f3e484fe3d49848fb60ea2cc7fbee88885
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 24 13:33:59 2018 +0100
Bug 21385: (follow-up) make query consistent
The expected items query wasn't consistent with other queries in this
module with regards to identifying cancelled orders
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.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 5e6f4f1f4fb346351dcfc6c580888022641d4b6a)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b2cf26de21db3055df7d9426dff9860c2bdad8bf
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Sep 24 13:23:25 2018 +0100
Bug 21385: Add Unit Tests
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.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 3f20c8c65172c1a32e7d2b20ed2506199423f103)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b3ab0a723a23cb59c241339fa122dae75689c7b0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Fri Sep 21 15:10:15 2018 +0100
Bug 21385: Correctly count all items in basket for booksellers list
To reproduce:
1) Create a basket with 2 biblios, one with 2 items and one with 1 item
2) Search for vendors and note the basket above should contain 'Item
count 3', 'Biblio count 2', 'Items expected 3'
3) Receive shipment, and only receive 1 of the items on the biblio with
2 items above.
4) Search for vendors and note that the 'Item count' for the basket
above is now '2'.
The item count for a closed basket should remain the same and should
differ from the 'items expected' count some items have been recieved.
Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Amended patch:
FAIL C4/Acquisition.pm
FAIL spelling
RECIEVED ==> RECEIVED
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 17db3ab05cb25d08f0790cff9eed5f0f75ca8107)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 23542b6d310695aa7f0f967cdb4c6bd6273be40b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Sep 29 16:04:56 2018 -0300
Bug 21448: Fix copy repeated subfields when linking an authority with 6xx
The reported issue was:
On field 606, if I use an Authority with multiple "x" subfields, it will
add just the first "x"
Error in the logs:
Odd number of elements in anonymous hash at /home/vagrant/kohaclone/authorities/blinddetail-biblio-search.pl line 97.
We should pass a ref (!), caused by
commit a7df1f9f8eb9ed16246964d94dd8a69b756b6551
Bug 18904: (follow-up) Retrieve subfield in the order they are stored
Test plan:
Edit an authority and add several $x to 600
Link this authority to a bibliographic record
=> Without this patch only the first subfield is copied
=> With this patch applied they are all copied
Signed-off-by: José Anjos <joseanjos at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 08386cd3f05c5bc4dc6306e3a1d6c4878cce7c86)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 8 ++-
Koha/Old/Checkout.pm | 1 +
Koha/Schema/Result/Aqorder.pm | 7 +-
authorities/blinddetail-biblio-search.pl | 2 +-
.../prog/en/modules/catalogue/issuehistory.tt | 2 +-
.../Acquisition/GetBasketsInfosByBookseller.t | 72 +++++++++++++++++++-
t/db_dependent/Koha/Checkouts.t | 30 ++++++--
7 files changed, 109 insertions(+), 13 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list