[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.02-130-gd4596ce
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 9 17:12:52 CEST 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, 19.05.x has been updated
via d4596cee7a1dc2a2657ab27c9661fffe036db719 (commit)
via eb2ecf828bb3a1a55d0559d350fe6c308a1e1a7a (commit)
via 865843866f0a72e15d46e018a448cbdf1c57bb2c (commit)
via 16de933cd4d52d86d7a540b37fa4bf3ecaf86a38 (commit)
via f50b0ba0541ab656598f78fcd577e35a1ff4ebea (commit)
via 57e9d113b65e1f0ff1717ce288a771cfe618326e (commit)
via e59c9133e66ccf6a2537787703684bc122c31faa (commit)
via a00b6b155617f686c2a67a4b2b9c985b7d851bd2 (commit)
via c1d1a52cf27432c8f922e09d12b7a283a27a5313 (commit)
via 3038990c8b45f8f901c3fe023c59037f59f69285 (commit)
via 4569d1487fcb64dca64bf9e52d94df7d73a2af98 (commit)
via 0b9c87f68c6b3f2882581721a2fdeddf8b9e2121 (commit)
via af01b95674f538e7ef3279f6dca9a4675c4d3272 (commit)
via 1b8b3e6991eb028e6310b69eaf665d0f362cee5d (commit)
via 55f0348c044b57e4bfdb13353cd5f002617d7611 (commit)
via 000fffbbf044061c1934eefd2d24c516d3d4fe2b (commit)
via c3d3dada1f0cbe89ef4493c6ee26c6dfe3deb509 (commit)
via d991ffdbee43984a592645a1b5624007bef96679 (commit)
via b96cc020e84b23d50744293ce7a424854d7a9f95 (commit)
via 679faaf91fbb6d24886a6a575e9c93c54c5a853c (commit)
via b5b24bdda7e9969e71047fa3bd71b12631ad787f (commit)
via ee9032d625d118f4ccdae881a49f393d8217ef86 (commit)
from 983dd03efafc271a01f89603937c0b3af0c84510 (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 d4596cee7a1dc2a2657ab27c9661fffe036db719
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jul 16 12:08:47 2019 +0000
Bug 23322: Correct case for boolean in ES search
I did not include tests only because this is a very small reasonable change and routine has no tests.
It does not affect behaviour, it only touches syntax lightly.
To test:
0 - Set SearchEngine to ElasticSearch
1 - Import the example record (a version is included in sample data in devbox/testing docker so you can skip)
2 - Stage the attached example record
3 - Match using 'ISBN' rule
4 - No matches found
5 - Apply patch
6 - Restart all the things
7 - Reapply matching with no rule
8 - Reapply with ISBN matcing
9 - It matches!
10 - Set SearchEngine to Zebra
11 - Reapply matching with no rule
12 - Reapply with ISBN matching
13 - Matching works as before in Zebra
Signed-off-by: Ron Houk <rhouk at ottumwapubliclibrary.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit ce1b79d55d421d6d173d644ee7061ebb5b93919a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit eb2ecf828bb3a1a55d0559d350fe6c308a1e1a7a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jul 31 16:01:39 2019 +0000
Bug 23405: Circulation autocomplete for patron lookup broken if cardnumber is empty
This patch modifies the JavaScript behind the patron search
results autocomplete widget which is displayed when typing in the search
header's "Check out" tab.
The script is modified to use the patron's borrowernumber instead of
cardnumber when redirecting to the checkout page.
Instead of copying the patron's card number into the search form and
triggering a submit, the autocomplete output uses direct links to each
result.
To better handle patrons with no card number, the output is modified to
show card number with parentheses only if card number is present.
To test you should have a patron in your database which has no card
number. Make sure CircAutocompl is enabled.
- From the circulation home page, type a patron name in the "Check out"
form and wait for autocomplete search results to display.
- Patrons with a card number should be listed in the format: Surname,
First name (Card number) Address.
- Patrons without a card number should be listed as: Surname, First
name Address.
- Clicking on either kind of result should link you the checkout screen
for that patron.
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Ian Walls <ian at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 82a0f5913974155bd79f82cf2075936de7b0c431)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 865843866f0a72e15d46e018a448cbdf1c57bb2c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 6 09:44:40 2019 -0500
Bug 22741: Add a test
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 75168e4ae5bad0806f96a39ce38f5f3f04e96c51)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 16de933cd4d52d86d7a540b37fa4bf3ecaf86a38
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Jun 20 16:00:59 2019 +0100
Bug 22741: Make updated_on timezone aware in Koha::Patron
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit e5c05344c0c182703965f77060e6595226047eea)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit f50b0ba0541ab656598f78fcd577e35a1ff4ebea
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jul 30 13:52:05 2019 +0000
Bug 23237: Fix POD and typos
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a6fb4e4f2af100c867da3434756a82f65c04b971)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 57e9d113b65e1f0ff1717ce288a771cfe618326e
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sat Jun 29 08:55:34 2019 +0200
Bug 23237: Plugin allow [% INCLUDE %] from template
From a plugin template it is useful to be able to include other templates with
[% INCLUDE %] directives. But TT module is used by Koha with absolute paths.
Relative paths are forbidden for security reasons. A new param [% PLUGIN_DIR %]
allow plugin templates to know where to find plugin home directory.
How to test:
1. Install kitchen-sink plugin.
2. Find tool-step1.tt file, and add this at the begining of the file:
[% INCLUDE "$PLUGIN_DIR/header.tt" %]
It ask to include a template header.tt which doesn't exit.
3. Run kitchen-sink plugin tool. You must have this error message:
Template process failed: file error - _path to plugin
directory_/Koha/Plugin/Com/ByWaterSolutions/KitchenSink/header.tt: not found
quod erat demonstrandum
Signed-off-by: Maryse Simard <maryse.simard at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 8c517d2f2860c08263f44dfde8d3cadea418694e)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit e59c9133e66ccf6a2537787703684bc122c31faa
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Aug 9 15:35:09 2019 +0200
Bug 23099: Compiled CSS
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit a00b6b155617f686c2a67a4b2b9c985b7d851bd2
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 11 18:13:08 2019 +0000
Bug 23099: OPAC Search result sorting "go" button flashes on page load
There are a few places in the OPAC where we hide the submit button on a
sorting form because the form auto-submits when the selection changes.
These should be hidden using CSS instead of JS to prevent the temporary
appearance of the submit button while the page loads.
To test, apply the patch and rebuild the OPAC CSS
(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client).
Test OPAC search results and OPAC checkout history. On both pages you
should not see a "Go" button next to the <select> input for changing the
sort order.
Disable JavaScript in your browser and test those pages again. The "Go"
button should appear.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit a89a203c1c85841a09b49771adbd77eeb76180c2)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c1d1a52cf27432c8f922e09d12b7a283a27a5313
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 28 12:53:20 2019 +0000
Bug 14549: POD and variable cleanup
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 3352d75bfeea1dd5d9d6e025b6884a190044003c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 3038990c8b45f8f901c3fe023c59037f59f69285
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 28 12:37:25 2019 +0000
Bug 14549: Check patrons reserves for any holds on a bib when checking out an item
MoveReserve uses CheckReserves to see if the current patron has any holds
on the title they are checking out, however, CheckReserves doesn't return
all holds on a biblio, it returns holds on the item from the holdsqueue
if they exist
This can create a condition where we check holds on an item, find we have it planned for
another borrower, confirm checkout to the current borrower, but don't fill their hold
To test:
1) Find record
2) place record level holds for 2 different patrons (record level)
3) Run holds queue builder, check the queue to confirm an item was selected for patron 1
Circulation->Holds queue->Library="All"
4) Check out the item queued for patron with priority 1 to the second patron
5) You should be asked to confirm, do so
6) Note the item checks out, but both holds remain
7) Apply patch
8) Check in the item
9) Don't confirm the hold
10) Check the holds on the record and the holds queue
11) Patron 1 should be priority 1 with an item selected from the holds queue
12) Checkout to patron 2 as before
13) Note the hold for patron 2 is filled this time
14) Prove -v t/db_dependent/Reserves.t
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 36ee00ed952ed9081eeeca5e98fe006fbaa12db6)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 4569d1487fcb64dca64bf9e52d94df7d73a2af98
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Fri Jun 28 12:36:16 2019 +0000
Bug 14549: Unit tests
To test:
1 - Apply just this patch
2 - prove -v t/db_dependent/Reserves.t
3 - Failure
4 - Apply second patch
5 - prove -v t/db_dependent/Reserves.t
6 - Success!
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 33bd28fb856d496370f7132171aa479c77b28af8)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 0b9c87f68c6b3f2882581721a2fdeddf8b9e2121
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Aug 9 15:12:09 2019 +0200
Bug 23396: (19.05.x) remove toggle_keyboard comming from Bug 17178
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit af01b95674f538e7ef3279f6dca9a4675c4d3272
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Aug 5 11:36:40 2019 +0100
Bug 23396: DBRev 19.05.02.002
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 3eadb87fd86b2331d4ea58aa86f1810bbf952c89)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 1b8b3e6991eb028e6310b69eaf665d0f362cee5d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Fri Aug 2 15:53:01 2019 -0300
Bug 23396: (QA follow-up) Add atomic update
New installs before the fix won't have the table populated, this patch
adds a fix for that, including the shortcut added by bug 17178.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 5e4e26dd0f7516bd3dca4758bbc3c72e4b9723d5)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 55f0348c044b57e4bfdb13353cd5f002617d7611
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Jul 30 13:37:28 2019 +0000
Bug 23396: Add keyboard_shortcuts.sql to C4/Installer.pm
To test:
1 - Back up your DB if you want to save it
2 - sudo koha-mysql kohadev
DROP database koha_kohadev;
CREATE database koha_kohadev;
3 - http://localhost:8081
4 - Go through the web installer
5 - Enable AdvancedCatalogingEditor
6 - Try to load it, fails with JS console error: insert_copyright is not defined
7 - Apply patch
8 - Repeat
9 - This time editor loads
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 484b8245af189edcaba64f191981cd5374237125)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 000fffbbf044061c1934eefd2d24c516d3d4fe2b
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sun May 5 15:12:15 2019 -0300
Bug 10492: Translation problems with TT directives in po files
This patch implements the replacement of TTvariables
'[%...%]' with normal placeholders '%s' for text
inside HTML tags (eg. img, meta, input)
The replacement is done in two files:
* xgettext.pl, used on create/update, so TTvars are not
found on the text to translate (msgid)
* tmpl_proccess3.pl, used on install time, so the correct
translation is found (msgstr) and the right TTvar is put on
the translated text.
To test:
Before applying the patch
1) Update your favorite language
cd misc/traslator
perl translate update xx-YY
2) Build a list (ini.txt) of 'msgid' to do a comparison
msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > ini.txt
3) Apply the patch
4) Update your favorite language, again
cd misc/traslator
perl translate update xx-YY
5) Build a final list (end.txt) of 'msgid' to do a comparison
msgcat --no-wrap --use-first po/xx-YY-*po -o - | egrep "^msgid" | sort > end.txt
6) Compare both files, you must find (most) TTvars replaced by '%s'
diff ini.txt end.txt
for example:
< msgid "Translate item type [% itemtype.itemtype | html %]"
> msgid "Translate item type %s"
< msgid "Holds on this item: [% item_loo.item_holds | html %] / Total holds on this record: [% item_loo.holds | html -%]"
> msgid "Holds on this item: %s / Total holds on this record: %s"
< msgid "tag_anchor_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]"
> msgid "tag_anchor_%s_%s%s"
< msgid "[% innerloo.tag_lib | html %] - Click to Expand this Tag"
> msgid "%s - Click to Expand this Tag"
7) Translate one of the examples, with more than one variable if
possible, for example this text in xx-YY-staff-prog.po
> msgid "Holds on this item: %s / Total holds on this record: %s"
Check it's not marked as 'fuzzy'
8) Apply the translation
perl translate install xx-YY
9) Check the translated string has all variables in the right order
edit koha-tmpl/intranet-tmpl/prog/es-ES/modules/tools/batchMod-edit.tt
around line '187', first '[% item_loo.item_holds | html %]', then
'[% item_loo.holds | html -%]' on this case,
or use another example
If approved this patch can be backported to current stable
versions.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0f5d14f70792d5406857a81c415bc3f58cbd8b96)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit c3d3dada1f0cbe89ef4493c6ee26c6dfe3deb509
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jul 31 12:38:16 2019 +0000
Bug 21518: Material type "three-dimensional artifact" displays as "visual material"
This patch makes a few corrections to the staff client MARC21 XSLT so
that the correct material type icons are displayed for pictures and
realia. The more-specific material type handling has been adapted from
the corresponding XSL files in the OPAC.
To test you must have default XSLT enabled and the DisplayIconsXSLT and
DisplayOPACiconsXSLT system preferences enabled.
- Apply the patch and locate records with "type of record" specified in
the leader as 'g', 'k', and 'r'.
A sample MARC file will be attached to the bug report with one of
each type of record. Import the records and search your catalog for
"Bug_21518."
- View the records in search results and their detail pages, both in
the OPAC and the staff client. In all cases the correct material type
icon should be displayed.
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 88ff22bb5a5d535893cf238ae784bb62a5b7d676)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d991ffdbee43984a592645a1b5624007bef96679
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jul 2 10:58:41 2019 +0100
Bug 23251: Correct formatting of IMD data ending in apostrophe
IMD text data may end in an apostrophe (e.g. dreamin' )
This was causing the segment to be incorrectly formatted
as only the last character was checked, not the preceding
character to check whether it was quoted
add a test for this specific occurence
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0c4112a200bfdcdbdba4ce7870aeced1f960cfd9)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b96cc020e84b23d50744293ce7a424854d7a9f95
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Jul 19 09:55:41 2019 +0000
Bug 23345: Rename include-indexes to exclude-indexes in koha-dump
Trivial edit. The usage statement is wrong.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit fea1d135be0f7e9ee55ae27f510861fe4c159307)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 679faaf91fbb6d24886a6a575e9c93c54c5a853c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 27 13:24:36 2019 +0000
Bug 23226: Remove type attribute from script tags: Cataloging
This patch removes the "type" attribute from <script> tags one
cataloging and one authorities template.
To test, apply the patch and confirm that examples of affected pages
work properly without any JavaScript errors in the browser console:
- Cataloging -> Cataloging home page
- Cataloging -> Cataloging home page -> Search results
- Authorities -> New authority -> New from Z39.50/SRU
Validating the HTML source of any of these pages should return no errors
related to the "type" attribute.
Signed-off-by: frederik chenier <frederik.chenier at inlibro.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit b52a17dade474530103f1b05a2efd39de9879c31)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit b5b24bdda7e9969e71047fa3bd71b12631ad787f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sat Jun 29 10:55:17 2019 -0500
Bug 23217: Remove SQL error when batch patron mod and not attribute selected
On the batch patron modification tool, if no patron attribute is selected then
an UPDATE query will be executed anyway. Indeed the form will send a
an empty "patron_attributes" parameter. We need to handle it.
Test plan:
Go to the patron modification tool
Enter a cardnumber
Change a field (like city)
Do not change anything in the patron's attributes
Save
=> Without this patch a SQL error is generated:
DBD::mysql::st execute failed: Cannot add or update a child row: a foreign key constraint fails (`koha_kohadev`.`borrower_attributes`, CONSTRAINT `borrower_attributes_ibfk_2` FOREIGN KEY (`code`) REFERENCES `borrower_attribute_types` (`code`) ON DELETE CASCADE ON UPDATE CASCADE) [for Statement "INSERT INTO borrower_attributes SET attribute = ?, code = ?, borrowernumber = ?" with ParamValues: 0=undef, 1="", 2="51"] at /home/vagrant/kohaclone/C4/Members/Attributes.pm line 287.
=> With this patch applied you will not see it
You should also test that you can modify patron's attributes ;)
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit 0b2a9b5872c72ee6b0f17d32e20c8e59231f03f3)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit ee9032d625d118f4ccdae881a49f393d8217ef86
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Apr 25 15:34:36 2019 +0000
Bug 21716: Escape publisher in item search
To prevent endless processing errors.
To test:
* create a biblio with a publisher with a backslash - i.e. 260$b with
graham\lineham
* do an item search that will include that title in the results
* wait forever, because it won't work.
* apply this patch
* repeat steps, notice that you
a. get results
b. your result is listed with it's correct publisher
* rejoice
Signed-off-by: Hayley Mapley <hayleymapley at catalyst.net.nz>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
(cherry picked from commit fbeb22802f41f8daf99498303146d1916c851507)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Installer.pm | 1 +
C4/Matcher.pm | 2 +-
C4/Reserves.pm | 34 +++++++-------
Koha.pm | 2 +-
Koha/Edifact/Order.pm | 2 +-
Koha/Patron.pm | 2 +-
Koha/Plugins/Base.pm | 48 +++++++++++++++++++-
debian/scripts/koha-dump | 2 +-
installer/data/mysql/updatedatabase.pl | 22 +++++++++
.../en/includes/catalogue/itemsearch_item.json.inc | 3 +-
.../intranet-tmpl/prog/en/includes/js_includes.inc | 12 ++---
.../prog/en/modules/cataloguing/addbooks.tt | 2 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 13 ++++--
.../prog/en/xslt/MARC21slim2intranetResults.xsl | 4 +-
.../prog/img}/famfamfam/OB.png | Bin 825 -> 825 bytes
.../prog/img/famfamfam/{GR.png => PK.png} | Bin 606 -> 606 bytes
.../prog/img/famfamfam/silk/object.png} | Bin 825 -> 825 bytes
.../prog/img}/famfamfam/silk/picture.png | Bin 606 -> 606 bytes
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 8 ++++
.../bootstrap/en/modules/opac-readingrecord.tt | 1 -
.../bootstrap/en/modules/opac-results-grouped.tt | 1 -
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 1 -
.../GR.png => opac-tmpl/lib/famfamfam/PK.png} | Bin 606 -> 606 bytes
misc/translator/tmpl_process3.pl | 28 +++++++++---
misc/translator/xgettext.pl | 5 ++
t/Ediorder.t | 13 +++++-
t/db_dependent/Koha/Patrons.t | 15 +++++-
t/db_dependent/Reserves.t | 30 +++++++++++-
tools/modborrowers.pl | 1 +
31 files changed, 207 insertions(+), 49 deletions(-)
copy koha-tmpl/{opac-tmpl/lib => intranet-tmpl/prog/img}/famfamfam/OB.png (100%)
copy koha-tmpl/intranet-tmpl/prog/img/famfamfam/{GR.png => PK.png} (100%)
copy koha-tmpl/{opac-tmpl/bootstrap/lib/famfamfam/silk/bricks.png => intranet-tmpl/prog/img/famfamfam/silk/object.png} (100%)
copy koha-tmpl/{opac-tmpl/bootstrap/lib => intranet-tmpl/prog/img}/famfamfam/silk/picture.png (100%)
copy koha-tmpl/{intranet-tmpl/prog/img/famfamfam/GR.png => opac-tmpl/lib/famfamfam/PK.png} (100%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list