[koha-commits] main Koha release repository branch master updated. v19.11.00-16-gca50137
Git repo owner
gitmaster at git.koha-community.org
Mon Dec 9 16:02:14 CET 2019
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 ca501374afa83ffe4f02920597cb977766704e5b (commit)
via 93b2905bdf5c18063ab30d029c5e7a09a8f91641 (commit)
via 6938b0eac577b1f0e3833ccf5cc0c05aa133d879 (commit)
via 142a0235ad9a266aeb5fdc0f0686aabdce43f5e6 (commit)
via 9fa2818899bf4495ca94c6d311ec750d39298167 (commit)
via 5d94cbefdc0f06c9cc9b57a9e3016f52fdf2d71a (commit)
via 3225d049bef956d5fd66ed93561ddc9108ce138a (commit)
via fa41a4a94d9493377a71d1272ec5b3cabed5ff85 (commit)
via fa1fa51562fbf018a1c11bf51895fd42034d8c4c (commit)
via 243e4cd03140732b4156d6d0bb1156f0aa90c2b6 (commit)
via 543e11fdfacb6c7a4a7aecb015fd2443cbcc3df6 (commit)
from 25ddfb15c5b0ec957ebf73874d41275701b818f7 (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 ca501374afa83ffe4f02920597cb977766704e5b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 18 10:30:04 2019 +0100
Bug 20948: Only display item-level hold info if first hold
On the item list of the catalogue detail page we display next item-level
hold info even if it is not the next hold. That leads to confusion as it
will not necessarily be the accurate info.
This patch makes the following changes:
- Display the item-level hold only if it is the next hold (priority ==
1)
- Display "There is an item level hold on this item (priority=X)"
if there is at least 1 item-level hold placed on this item
Test plan:
- Place several next available holds on a single item record
- Place an item level hold on the item
- Go the the biblio detail page
=> Without this patch, the item will show the item level hold
=> With the patch you see "There is an item level hold on this item"
- Check the item in, confirm the hold
=> No changes, the item will show the waiting hold info
- Cancel all the holds except the item-level one
=> No changes, the item will how the item-level one
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 93b2905bdf5c18063ab30d029c5e7a09a8f91641
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 18 10:10:56 2019 +0100
Bug 20948: Simplify existing code
No changes expected here.
Signed-off-by: Lisette Scheer <lisetteslatah at gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 6938b0eac577b1f0e3833ccf5cc0c05aa133d879
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 1 14:13:15 2019 -0300
Bug 23246: (follow-up) Hardcoding tab position is not enough
There are many conditions that determine the tab number for 'media'.
Translated into variables that hold the tabs count on each condition, it
is clear that '3' was not good enough:
[%- holdings = (SeparateHoldings) ? 2 : 1
notes = (MARCNOTES || notes) ? 1 : 0
acq = (Koha.Preference('AcquisitionDetails')) ? 1 : 0
frbr = (FRBRizeEditions && XISBNS) ? 1 : 0
local_covers = (LocalCoverImages && (localimages || CAN_user_tools_upload_local_cover_images)) ? 1 : 0
media_tab = holdings + notes + acq + frbr + local_covers
-%]
This patch gets rid of the hardcoded value, adds an id to the 'media'
tab (i.e. 'media_tab') and uses JS to get the right index.
To test:
- Play with the different options governing those variables
=> FAIL: 3 is not always the 'media' tab
- Apply this patch
- Repeat your tests
=> SUCCESS: It always picks the 'media' tab
- Sign off :-D
Sponsored-by: American Numismatics Society
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 142a0235ad9a266aeb5fdc0f0686aabdce43f5e6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Jul 1 13:16:42 2019 -0300
Bug 23246: Only jump into the 'images' tab HTML5MediaEnabled is set
This patch makes jumping into the third tab happen only if
HTML5MediaEnabled is set to 'both' or 'staff'.
To test:
- Have HTML5MediaEnabled set to 'opac' or 'not at all'
- Open the detail page of a record with no holdings
=> FAIL: The 'images' tab is selected
- Apply this patch
- Reload
=> SUCCESS: The 'holdings' tab is selected as it should be.
- Sign off :-D
Sponsored-by: America Numismatic Society
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9fa2818899bf4495ca94c6d311ec750d39298167
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 26 17:31:15 2019 +0000
Bug 24126: Article requests tab appears twice on patron's checkout screen
This patch removes duplicated markup on the checkout page which results
in the "Article requests" tab appearing twice.
To test, apply the patch and enable ArticleRequests.
Check out to a patron. In the set of tabs that includes checkouts,
holds, restrictions, etc., the "Article requests" tab should appear only
once.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5d94cbefdc0f06c9cc9b57a9e3016f52fdf2d71a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 20 10:56:24 2019 +0100
Bug 23987: "return to cataloguing" if the record is deleted from bachMod-del
If a bibliographic record is deleted after having deleted all their items in a batch,
we should not display a "return to the record" button but "return to cataloguing" instead
Test plan:
1 - Have/make a bib with items
2 - On details page select Edit->Delete items in a batch
3 - Select all items and check "Delete record if no items remain"
4 - Delete the things
5 - On confirmation screen you have a count of items/bibs deleted
=> Without the patch there is a 'Return to record' button that leads to nowhere
=> With this patch there is a "Return to cataloging module" button
6 - Repeat using the "Delete selected items" link on top of the items table
=> Without the patch there is a 'Return to where you were' button that leads to nowhere
=> With this patch there is a "Return to cataloging module" button
Note that there is a link AND a button, coming from
commit 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee
Bug 15824 - 'Done' button is unclear on batch item modification and deletion
I do not think it makes sense to have both.
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 3225d049bef956d5fd66ed93561ddc9108ce138a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 20 10:53:32 2019 +0100
Bug 23987: Use src=CATALOGUING for edition/deletion in batch from items table
There are 2 ways to land in batchMod from the detail page of a bib
record: from the Edit menu, and the action buttons on top of the items
table.
We want the same behavior for both and so use src=CATALOGUING
It will make batchMod to behave identically for the "return" button
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fa41a4a94d9493377a71d1272ec5b3cabed5ff85
Author: Lisette Scheer <lisetteslatah at gmail.com>
Date: Thu Nov 14 21:53:25 2019 +0000
Bug 24033: Fix column labelling on basket summary page (ecost)
When viewing a basket, some of the column names are unclear
and are different than the terms used for the same field
on the order form. This patch edits the column titles to
match the order form.
To test:
1) In acquisitions, create a budget.
2) In acquisitions, create a fund.
3) In acquisitions, create a vendor.
4) In acquisitions, create a basket and add a test item to the basket.
5) Observe the column titles ecost tax inc. and ecost tax exc.
Check the column visibility settings if you don't see
the columns.
6) Apply the patch.
7) Observe the column titles have been updated.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fa1fa51562fbf018a1c11bf51895fd42034d8c4c
Author: Lisette Scheer <lisetteslatah at gmail.com>
Date: Tue Nov 19 18:15:17 2019 +0000
Bug 24056: Capitalization: Cash Register ID on cash register management page
When editing a cash register, Cash register ID doesn't follow
our capitalization guidelines. This patch fixes that.
To Test:
1) Turn on cash register usage in the system preferences.
2) Add a cash register.
3) Edit the cash register.
4) Note the incorrect capitalization.
5) Apply the patch.
6) Edit the cash register.
7) Note the correct capitalization.
Signed-off-by: George Williams <george at nekls.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 243e4cd03140732b4156d6d0bb1156f0aa90c2b6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Nov 18 16:10:14 2019 +0000
Bug 24057: Hea is not an acronym
This patch changes "HEA" (incorrectly capitalized) to "Hea" on the
staff client administration home page.
To test, apply the patch and set the "UsageStats" system preference to
"No, let me think about it."
- Go to Administration in the staff client.
- There should be a message at the top asking if you want to share
anonymous usage statisitcs with the community. The word "Hea" in this
message should be capitalized correctly.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 543e11fdfacb6c7a4a7aecb015fd2443cbcc3df6
Author: Lisette Scheer <lisetteslatah at gmail.com>
Date: Tue Nov 19 17:50:45 2019 +0000
Bug 24053: Typo in FinePaymentAutoPopup description
There is a typo in the FinePaymentAutoPopup system preference description.
This patch fixes that.
To test:
1) Go to the systems preferences in administration.
2) Search for FinePaymentAutoPopup
3) Observe .. at the end of the preference description.
4) Apply the patch
5) Repeat steaps 1-2
6) Ovserve correct punctuation at the end of the preference description.
Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
catalogue/detail.pl | 8 +-----
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +--
.../prog/en/modules/admin/admin-home.tt | 2 +-
.../prog/en/modules/admin/cash_registers.tt | 2 +-
.../en/modules/admin/preferences/accounting.pref | 2 +-
.../prog/en/modules/catalogue/detail.tt | 29 +++++++++++---------
.../prog/en/modules/circ/circulation.tt | 6 ----
.../prog/en/modules/tools/batchMod-del.tt | 12 ++++++--
tools/batchMod.pl | 18 ++++++++----
9 files changed, 44 insertions(+), 39 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list