[koha-commits] main Koha release repository branch master updated. v18.05.00-rc1-12-g92ac27b
Git repo owner
gitmaster at git.koha-community.org
Wed May 16 17:38:10 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, master has been updated
via 92ac27b7b2b91ff9003bde41c21a19a002be778c (commit)
via 6c1092396a520f6784bbcc45b3d3e251864336ca (commit)
via 554642ae75042a1565dbdc9044b6f614db218a55 (commit)
via 88ac8c499f878a1c0ac622d53742a3d9acea1f64 (commit)
via 8b6dc6b23ccb26e18c437a578b4e20174ee1ea58 (commit)
via 1798d22e764bebf46e2915e1c0b7c3360ea8dd51 (commit)
via c585f1149770ec401f188e061211501897cec0bf (commit)
from 9b31bc2d27c6e045a6e7ea079778c47674c135db (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 92ac27b7b2b91ff9003bde41c21a19a002be778c
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue May 15 02:59:24 2018 +0000
Bug 20706: Fix bad HTML link to help file
Before there is no href.
After there is.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6c1092396a520f6784bbcc45b3d3e251864336ca
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu May 10 19:03:47 2018 +0200
Bug 20706: Adds en language code to the links to the manual
As we don't have a fix yet to link to the right translated manual,
this adds /en to the links from the help files to the manual to
make them work again.
Check with both patches applied, that the links work.
You will have to change 17.11 to 18.05.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 554642ae75042a1565dbdc9044b6f614db218a55
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Thu May 3 23:26:40 2018 +0200
Bug 20706: Fixes the links to the manual to reflect chanced chapter file names
The numbering in front of the chapter file names has been removed,
so the links need to be adapted accordingly.
Note:
Testing this in master currently won't work for 2 reasons:
- We are still using 17.11 as version variable, will be 18.05 later.
- We are missing the lanugage code before /html and this leads
to an outdated version of the 18.05 manual.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 88ac8c499f878a1c0ac622d53742a3d9acea1f64
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed May 16 14:43:27 2018 +0200
Bug 20724: (QA follow-up) Remove two obsolete comment lines
No test plan :)
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 8b6dc6b23ccb26e18c437a578b4e20174ee1ea58
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:33 2018 -0300
Bug 20724: Add tests for ReservesNeedReturns
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1798d22e764bebf46e2915e1c0b7c3360ea8dd51
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu May 10 11:40:11 2018 -0300
Bug 20724: Move the ReservesNeedReturns logic to AddReserve
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit c585f1149770ec401f188e061211501897cec0bf
Author: Kyle M Hall <kyle at bywatetsolutions.com>
Date: Thu May 10 08:12:04 2018 -0400
Bug 20724: Correctly mark an hold as waiting - ReservesNeedReturns
We need to call Koha::Hold->set_waiting to correctly
calculate the expiration date.
It fixes a regression introduced by
commit 26634151dbce0bf39ff6c9eda5b58bb993996a2d
Bug 12063 - Fix QA failures
The expiration date has to be set for waiting holds
== Test plan (time to execute: less than 4min) ==
1. Set ReservesNeedReturns to "Don't automatically"
2. Place a hold on a specific item
3. Check it in and confirm hold
4. The hold should have an expiration date
record page → Hold → "Expiration" column
5. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
6. Set ReservesNeedReturns to "Automatically"
7. Place a hold on a specific item
(which should also behave like we check the item in to
keep it for the patron)
8. The hold should have an *empty* expiration date
record page → Hold → "Expiration" column
9. Holds awaiting pickup page should crash
staff:/cgi-bin/koha/circ/waitingreserves.pl
10. Cancel the hold to remove the corrupted data
record page → Hold → the red X
11. Apply this patch
12. Place a hold on a specific item
13. The hold should have an expiration date (not empty)
14. It should be listed in staff:/cgi-bin/koha/circ/waitingreserves.pl
15. Celebrate!
Signed-off-by: Victor Grousset <victor.grousset at biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Reserves.pm | 11 ++++
.../intranet-tmpl/prog/en/modules/help/about.tt | 2 +-
.../prog/en/modules/help/acqui/acqui-home.tt | 2 +-
.../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/help/acqui/basket.tt | 2 +-
.../prog/en/modules/help/acqui/basketgroup.tt | 2 +-
.../prog/en/modules/help/acqui/basketheader.tt | 2 +-
.../prog/en/modules/help/acqui/booksellers.tt | 2 +-
.../prog/en/modules/help/acqui/edifactmsgs.tt | 2 +-
.../prog/en/modules/help/acqui/histsearch.tt | 2 +-
.../prog/en/modules/help/acqui/invoice.tt | 2 +-
.../prog/en/modules/help/acqui/invoices.tt | 2 +-
.../prog/en/modules/help/acqui/lateorders.tt | 2 +-
.../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +-
.../prog/en/modules/help/acqui/neworderempty.tt | 2 +-
.../en/modules/help/acqui/newordersubscription.tt | 2 +-
.../en/modules/help/acqui/newordersuggestion.tt | 2 +-
.../prog/en/modules/help/acqui/orderreceive.tt | 2 +-
.../prog/en/modules/help/acqui/parcel.tt | 2 +-
.../prog/en/modules/help/acqui/parcels.tt | 2 +-
.../prog/en/modules/help/acqui/supplier.tt | 2 +-
.../prog/en/modules/help/acqui/uncertainprice.tt | 2 +-
.../prog/en/modules/help/acqui/z3950_search.tt | 2 +-
.../prog/en/modules/help/admin/admin-home.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgets.tt | 2 +-
.../prog/en/modules/help/admin/aqcontract.tt | 2 +-
.../prog/en/modules/help/admin/aqplan.tt | 2 +-
.../modules/help/admin/auth_subfields_structure.tt | 2 +-
.../en/modules/help/admin/auth_tag_structure.tt | 2 +-
.../en/modules/help/admin/authorised_values.tt | 2 +-
.../prog/en/modules/help/admin/authtypes.tt | 2 +-
.../prog/en/modules/help/admin/biblio_framework.tt | 2 +-
.../modules/help/admin/branch_transfer_limits.tt | 2 +-
.../prog/en/modules/help/admin/branches.tt | 2 +-
.../prog/en/modules/help/admin/categorie.tt | 2 +-
.../prog/en/modules/help/admin/checkmarc.tt | 2 +-
.../prog/en/modules/help/admin/cities.tt | 2 +-
.../prog/en/modules/help/admin/classsources.tt | 2 +-
.../prog/en/modules/help/admin/columns_settings.tt | 2 +-
.../prog/en/modules/help/admin/currency.tt | 2 +-
.../prog/en/modules/help/admin/didyoumean.tt | 2 +-
.../prog/en/modules/help/admin/edi_accounts.tt | 4 +-
.../prog/en/modules/help/admin/edi_ean_accounts.tt | 2 +-
.../prog/en/modules/help/admin/fieldmapping.tt | 2 +-
.../modules/help/admin/item_circulation_alerts.tt | 2 +-
.../en/modules/help/admin/items_search_fields.tt | 2 +-
.../prog/en/modules/help/admin/itemtypes.tt | 2 +-
.../prog/en/modules/help/admin/koha2marclinks.tt | 2 +-
.../modules/help/admin/marc_subfields_structure.tt | 2 +-
.../prog/en/modules/help/admin/marctagstructure.tt | 2 +-
.../prog/en/modules/help/admin/matching-rules.tt | 2 +-
.../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +-
.../prog/en/modules/help/admin/oai_sets.tt | 2 +-
.../en/modules/help/admin/patron-attr-types.tt | 2 +-
.../prog/en/modules/help/admin/preferences.tt | 2 +-
.../prog/en/modules/help/admin/smart-rules.tt | 2 +-
.../en/modules/help/admin/systempreferences.tt | 2 +-
.../en/modules/help/admin/transport-cost-matrix.tt | 2 +-
.../prog/en/modules/help/admin/z3950servers.tt | 2 +-
.../modules/help/authorities/authorities-home.tt | 2 +-
.../en/modules/help/authorities/authorities.tt | 2 +-
.../prog/en/modules/help/authorities/detail.tt | 2 +-
.../prog/en/modules/help/authorities/merge.tt | 2 +-
.../prog/en/modules/help/catalogue/detail.tt | 2 +-
.../prog/en/modules/help/catalogue/issuehistory.tt | 2 +-
.../prog/en/modules/help/catalogue/itemsearch.tt | 2 +-
.../prog/en/modules/help/catalogue/moredetail.tt | 2 +-
.../en/modules/help/catalogue/search-history.tt | 2 +-
.../prog/en/modules/help/catalogue/search.tt | 2 +-
.../prog/en/modules/help/cataloguing/addbiblio.tt | 2 +-
.../prog/en/modules/help/cataloguing/addbooks.tt | 2 +-
.../prog/en/modules/help/cataloguing/additem.tt | 2 +-
.../prog/en/modules/help/cataloguing/linkitem.tt | 2 +-
.../prog/en/modules/help/cataloguing/merge.tt | 2 +-
.../prog/en/modules/help/cataloguing/moveitem.tt | 2 +-
.../prog/en/modules/help/circ/branchoverdues.tt | 2 +-
.../prog/en/modules/help/circ/branchtransfers.tt | 2 +-
.../prog/en/modules/help/circ/circulation-home.tt | 2 +-
.../prog/en/modules/help/circ/circulation.tt | 2 +-
.../prog/en/modules/help/circ/offline.tt | 2 +-
.../prog/en/modules/help/circ/on-site_checkouts.tt | 2 +-
.../prog/en/modules/help/circ/overdue.tt | 2 +-
.../prog/en/modules/help/circ/pendingreserves.tt | 2 +-
.../prog/en/modules/help/circ/renew.tt | 2 +-
.../prog/en/modules/help/circ/reserveratios.tt | 2 +-
.../prog/en/modules/help/circ/returns.tt | 2 +-
.../en/modules/help/circ/selectbranchprinter.tt | 2 +-
.../en/modules/help/circ/transferstoreceive.tt | 2 +-
.../prog/en/modules/help/circ/view_holdsqueue.tt | 2 +-
.../prog/en/modules/help/circ/waitingreserves.tt | 2 +-
.../en/modules/help/course_reserves/add_items.tt | 2 +-
.../modules/help/course_reserves/course-details.tt | 2 +-
.../help/course_reserves/course-reserves.tt | 2 +-
.../prog/en/modules/help/course_reserves/course.tt | 2 +-
.../en/modules/help/labels/label-edit-batch.tt | 2 +-
.../en/modules/help/labels/label-edit-layout.tt | 2 +-
.../en/modules/help/labels/label-edit-profile.tt | 2 +-
.../en/modules/help/labels/label-edit-template.tt | 2 +-
.../prog/en/modules/help/labels/label-home.tt | 2 +-
.../prog/en/modules/help/labels/label-manage.tt | 8 +--
.../prog/en/modules/help/labels/spinelabel-home.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +-
.../prog/en/modules/help/members/boraccount.tt | 2 +-
.../prog/en/modules/help/members/discharge.tt | 2 +-
.../prog/en/modules/help/members/files.tt | 2 +-
.../prog/en/modules/help/members/mancredit.tt | 2 +-
.../prog/en/modules/help/members/maninvoice.tt | 2 +-
.../prog/en/modules/help/members/member-flags.tt | 2 +-
.../en/modules/help/members/member-password.tt | 2 +-
.../prog/en/modules/help/members/member.tt | 2 +-
.../prog/en/modules/help/members/memberentry.tt | 2 +-
.../prog/en/modules/help/members/members-home.tt | 2 +-
.../prog/en/modules/help/members/members-update.tt | 2 +-
.../prog/en/modules/help/members/moremember.tt | 2 +-
.../prog/en/modules/help/members/notices.tt | 2 +-
.../prog/en/modules/help/members/pay.tt | 2 +-
.../prog/en/modules/help/members/paycollect.tt | 2 +-
.../modules/help/members/purchase-suggestions.tt | 2 +-
.../prog/en/modules/help/members/readingrec.tt | 2 +-
.../prog/en/modules/help/members/routing-lists.tt | 2 +-
.../prog/en/modules/help/members/statistics.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +-
.../prog/en/modules/help/offline_circ/list.tt | 2 +-
.../en/modules/help/offline_circ/process_koc.tt | 2 +-
.../prog/en/modules/help/patron_lists/lists.tt | 2 +-
.../prog/en/modules/help/patroncards/edit-batch.tt | 2 +-
.../en/modules/help/patroncards/edit-layout.tt | 2 +-
.../en/modules/help/patroncards/edit-profile.tt | 2 +-
.../en/modules/help/patroncards/edit-template.tt | 2 +-
.../prog/en/modules/help/patroncards/home.tt | 2 +-
.../en/modules/help/patroncards/image-manage.tt | 2 +-
.../prog/en/modules/help/patroncards/manage.tt | 2 +-
.../prog/en/modules/help/plugins/plugins-home.tt | 2 +-
.../prog/en/modules/help/plugins/plugins-upload.tt | 2 +-
.../en/modules/help/reports/acquisitions_stats.tt | 2 +-
.../prog/en/modules/help/reports/bor_issues_top.tt | 2 +-
.../prog/en/modules/help/reports/borrowers_out.tt | 2 +-
.../en/modules/help/reports/borrowers_stats.tt | 2 +-
.../prog/en/modules/help/reports/cat_issues_top.tt | 2 +-
.../prog/en/modules/help/reports/catalogue_out.tt | 2 +-
.../en/modules/help/reports/catalogue_stats.tt | 2 +-
.../prog/en/modules/help/reports/dictionary.tt | 2 +-
.../prog/en/modules/help/reports/guided_reports.tt | 2 +-
.../en/modules/help/reports/issues_avg_stats.tt | 2 +-
.../prog/en/modules/help/reports/issues_stats.tt | 2 +-
.../prog/en/modules/help/reports/itemslost.tt | 2 +-
.../prog/en/modules/help/reports/manager.tt | 2 +-
.../prog/en/modules/help/reports/reports-home.tt | 2 +-
.../prog/en/modules/help/reports/reserves_stats.tt | 2 +-
.../prog/en/modules/help/reports/serials_stats.tt | 2 +-
.../prog/en/modules/help/reserve/request.tt | 2 +-
.../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +-
.../rotating_collections/rotatingCollections.tt | 4 +-
.../en/modules/help/serials/checkexpiration.tt | 2 +-
.../prog/en/modules/help/serials/claims.tt | 2 +-
.../prog/en/modules/help/serials/routing.tt | 2 +-
.../en/modules/help/serials/serials-collection.tt | 2 +-
.../prog/en/modules/help/serials/serials-edit.tt | 2 +-
.../prog/en/modules/help/serials/serials-home.tt | 2 +-
.../en/modules/help/serials/subscription-add.tt | 2 +-
.../en/modules/help/serials/subscription-detail.tt | 2 +-
.../help/serials/subscription-frequencies.tt | 2 +-
.../help/serials/subscription-numberpatterns.tt | 2 +-
.../prog/en/modules/help/suggestion/suggestion.tt | 2 +-
.../prog/en/modules/help/tags/list.tt | 2 +-
.../prog/en/modules/help/tags/review.tt | 2 +-
.../prog/en/modules/help/tools/batchMod.tt | 2 +-
.../en/modules/help/tools/batch_delete_records.tt | 2 +-
.../help/tools/batch_record_modification.tt | 2 +-
.../prog/en/modules/help/tools/cleanborrowers.tt | 2 +-
.../prog/en/modules/help/tools/csv-profiles.tt | 2 +-
.../prog/en/modules/help/tools/export.tt | 2 +-
.../prog/en/modules/help/tools/holidays.tt | 2 +-
.../prog/en/modules/help/tools/import_borrowers.tt | 2 +-
.../prog/en/modules/help/tools/inventory.tt | 2 +-
.../prog/en/modules/help/tools/koha-news.tt | 2 +-
.../prog/en/modules/help/tools/letter.tt | 2 +-
.../en/modules/help/tools/manage-marc-import.tt | 2 +-
.../help/tools/marc_modification_templates.tt | 2 +-
.../prog/en/modules/help/tools/modborrowers.tt | 2 +-
.../prog/en/modules/help/tools/overduerules.tt | 2 +-
.../prog/en/modules/help/tools/picture-upload.tt | 2 +-
.../prog/en/modules/help/tools/quotes-upload.tt | 2 +-
.../prog/en/modules/help/tools/quotes.tt | 2 +-
.../prog/en/modules/help/tools/scheduler.tt | 2 +-
.../en/modules/help/tools/stage-marc-import.tt | 2 +-
.../prog/en/modules/help/tools/tools-home.tt | 2 +-
.../en/modules/help/tools/upload-cover-image.tt | 2 +-
.../prog/en/modules/help/tools/viewlog.tt | 2 +-
.../prog/en/modules/help/virtualshelves/shelves.tt | 2 +-
opac/opac-reserve.pl | 8 ---
reserve/placerequest.pl | 12 -----
t/db_dependent/Reserves.t | 56 +++++++++++++++++++-
194 files changed, 261 insertions(+), 216 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list