Jonathan Druart [Wed, 20 Jan 2016 09:40:25 +0000 (09:40 +0000)]
Bug 15560: Fix display of multiple item types in pending reserves report
Same fix as previous patch, but for item types.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
879ee53be7351d88cc16b370ada9953d6c96e805)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Wed, 20 Jan 2016 00:46:14 +0000 (01:46 +0100)]
Bug 15560: Fix display of multiple branches and locations in pending reserves report
The patches from bug 12152 broke the display on the pending reserves/
holds to pull report when items from multiple branches and with
multiple locations were displayed. The table cells were left empty.
To test:
- Add a record with at least 2 items from different locations and
holdingbranches
- Open the 'holds to pull' report
- Verify all branches and locations show with their correct
description
Signed-off-by: Natasha <tasham_8@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
363cb9c02ed017a0a20951d5caa9f9e5376600d0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
16049ee599d64dfdef7bbb37bd15db2d4ec83547)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Julian Maurice [Tue, 12 Jan 2016 15:49:15 +0000 (16:49 +0100)]
Bug 15572: TransformHtmlToMarc - rewrite the loop
This rewrites the while loop into a for loop, so $i still gets
incremented when we call next
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Make sense. Add readability. Infinite loop no more possible.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
1eab5c199d21a622abde7e47ca248d80e882ca46)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
e10f011dd1e639a5291728ef501d0918b049b713)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 12 Jan 2016 15:23:33 +0000 (15:23 +0000)]
Bug 15572: Add tests for TransformHtmlToMarc
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
467355d846a047ba3e77c0e9d73bf2323ab4fd67)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
45e10ea437c57203dc4dfac8e2960f9aa8d78209)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Tue, 12 Jan 2016 10:53:11 +0000 (11:53 +0100)]
Bug 15572: Follow-up to fix error on authority creation
Bug 6657 modified the way C4::Biblio::TransformHtmlToMarc operates in order to
solve an issue occuring during biblio record cataloguing. But this function is
also used by authorities cataloguing, and the code in this case is irrelevante.
This followup allows to distinguish for which kind of record
TransformHtmlToMarc is called: biblio/authority.
A bug appears in authority creation without this patch in some circunstances:
when authid is linked to 001 field.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Tested with a new authority record
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
2ca9bd5dc247ae26225cbc299c1bc0883bc444e0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
44bd1995bf8577713a7d6fca83a52ed14cd6d7fa)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 20 Jan 2016 08:45:48 +0000 (08:45 +0000)]
Bug 15607: batch patron mod - do not update dates if not given
Bug 15332 fixed a bug but introduced a bigger one. Even if dateenrolled and
dateexpiry are not modified, they will be updated to today.
Indeed, dt_from_string returns today without parameters.
Test plan:
- Set dateenrolled and expirydate for a patron
- Using the batch patron mod tool, update any field but dateenrolled and
expirydate.
=> Without this patch, the 2 date fields should be set to today
=> With this patch applied, the 2 date fields should not have been
modified.
Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
2505a3d840c15e51c7967a576d53a416b5f92bfb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
f0c36157ef13ad7a8f4238128cb145d94b9c9504)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Thu, 21 Jan 2016 15:25:33 +0000 (16:25 +0100)]
Bug 15579: Fix permission for batch record modification
To test:
- For a patron, permissions 'catalogue' and 'records_batchmod' only
- Log in as this patron
- Go to /cgi-bin/koha/tools/batch_record_modification.pl
Without patch: You have no permisson to acces the page.
With patch: Page 'Batch record modification' displays as expected.
(Amended to fix wrong test plan)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
e4715453e321c04da66c85143e7c8737947eaa75)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
d1e8575926579c5e08f7ec81f1cd648b90a8eebb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Mon, 21 Dec 2015 12:24:46 +0000 (12:24 +0000)]
Bug 15367: Do not display repeatable patron attributes in the batch patron modification
The repeatable patron attributes are not correctly managed and can cause
data lost. To avoid that, the easier way is not to display them in the
batch patron modification tool.
This should be implemented, as a new enhancement.
Test plan:
Create some patron attributes, some should be repeatable.
Use the batch patron modification tool to modify patrons.
With this patch, the patron attributes marked as repeatable won't be
display anymore.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Works as described, no koha-qa errors
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
9030800e78ad7de868e1c5fa4c9fd469660e6e5d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2fbd04103a1807efd7378a3ee9c60e7974ccb606)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Wed, 13 Jan 2016 07:44:52 +0000 (08:44 +0100)]
Bug 15344: follow-up specific to 3.20
Katrin Fischer [Wed, 6 Jan 2016 22:05:35 +0000 (23:05 +0100)]
Bug 15511: Fix tabbed display on OPAC patron account summary page
Some variables were not correctly renamed in a previous patch,
resulting in the fines tab of the OPAC patron summary page
not showing correctly.
To test:
- Go to the OPAC patron account
- Check the display of the Checkouts, Fines and Holds tabs on
the summary page
- Verify that with the patch, the display is corrected
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
bca01829c9bb86f5183d8a1bf93236ec8cf67be2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
c29372726a320fc4e445163bb78478e2fc249b44)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Tue, 5 Jan 2016 15:54:59 +0000 (15:54 +0000)]
Bug 15412: Enable dropdowns date selector when suspending holds
It seems to be the way to fix that
https://stackoverflow.com/questions/
13649459/twitter-bootstrap-multiple-modal-error
Test plan:
1 - Place a hold through the opac
2 - View your account->Holds
3 - Click suspend hold
4 - You should be able to select a date using the arrows and dropdowns
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
01d48a78258f98f693a8f48d7294a6ae880d5fc4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2c84b8a78bef287e1563ec10527e0f67cc39d125)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 5 Jan 2016 08:14:30 +0000 (09:14 +0100)]
Bug 15462 - Unable to renew books via circ/renew.pl
To verify: Got to circ/circulation.pl and try to renew an item.
Result: Can't call method "single" without a package or
object reference at /usr/share/kohaclone/circ/renew.pl
line 57
To test:
- Apply patch
- Try to renew items that are or are not checked out. Error
no longer occurs.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
68dee0de8e244e1badf51e7603ecd7341826c23c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
5686ba50ba005b1cd8cf4d28a35c28c0c34d3c71)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Brendan Gallagher [Thu, 31 Dec 2015 18:38:40 +0000 (18:38 +0000)]
Bug 13022: Update DB rev (3.20.07.001)
(cherry picked from commit
b392ebb81574a1d8615c2000b3ee6c24420d0c1c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 17 Apr 2015 14:41:13 +0000 (10:41 -0400)]
Bug 13022 [QA Followup] - Highlight the results with inaccurate status, add explanation when mouse hovers over.
Bug 13022 [QA Followup] - Revert changes in whitespace back to original for items count lines
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
df2bab8f61ca5d06768c5425c55f3f08d9485966)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
c621641bf3a3b6164b9c18ff5d119273528f92c7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 17 Apr 2015 13:51:03 +0000 (09:51 -0400)]
Bug 13022 [QA Followup] - Allow the pref to be unset for unlimited item status checks
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
7ab9d7d91d543cd2e6e82de6b536ee7ce1cb0508)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
6e0a32a2633a244322a19d0e7494dc2151a02e8f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Thu, 2 Oct 2014 13:19:21 +0000 (09:19 -0400)]
Bug 13022 - Hardcoded limit causes records with more than 20 items to show inaccurate statuses
If a record has more than 20 items, all the items over 20 will show as
available on the search results even if they are not!
This is a hard coded limit in the Search module. This number should be
configurable.
Test Plan:
1) Create a record with more than 20 items
2) Set all the items to waiting holds or in transit
3) Search for results that will include that item
4) Note some say they are available even though they are not
5) Apply this patch
6) Run updatedatabase.pl
7) Set the new system preference MaxSearchResultsItemsPerRecordStatusCheck
to a number larger than the number of items on your record
8) Re-run the search
9) Note that the hold and transit statuses for the items are now correct
Signed-off-by: Andreas Hedström Mace <andreas.hedstrom.mace@sub.su.se>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
d3184fa85b8906d0921522ce0c26dab98a4a2778)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
f552e658e44208e86b03bcd659d41eaedd69ae46)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Magnus Enger [Tue, 8 Dec 2015 20:11:58 +0000 (21:11 +0100)]
Bug 15304: Remove Norwegian strings from nl-search.tt
When nl-search.pl gets data from the Norwegian national patron
database, it does so in an XML format that has Norwegian element
names. nl-search.pl displays the data with the Noregian element
names as labels. This means Norwegian words turn up in translations,
which is messy. This patch replaces the Norwegian labels with
English ones.
To test:
- Only Norwegian libraries and vendors get access to search against
the national patron database, so a proper functional test is not
possible
- Alternative 1: Just have a look at the nl-search.tt template
before and after the patch and verify that after the patch the
Norwegian strings that would be visible to a user are gone
- Alternative 2:
- Verify that e.g. en-GB-staff-prog.po contains the Norwegian
string "kjonn"
- Apply the patch
- Create new .po files with e.g. "./translate create en-GB"
- Verify that "kjonn" is now gone from en-GB-staff-prog.po
Version 2: Tweak a couple of labels to be more in line with labels used
elsewhere in Koha, to avoid variants when translating.
Version 3: Replace e.g. "Gender: </span>" with "Gender:</span> " to
avoid similar-except-for-whitespace strings in translation.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
A few new strings, all previous removed.
No koha-qa errors
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
bd4a6830527b3d1482e41f084098de66eacf5bcd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
8314d1beb5cd38a0d9e8a1cbbca13be508727fd9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Mon, 9 Nov 2015 17:05:39 +0000 (11:05 -0600)]
Bug 15170 - Add 264 field to MARC21*DC.xsl
Modify MARC21*DC.xsl to add RDA 264 field
To test:
- Copy from LOC z39.50 the Maxwell's handbook for RDA (ISBN
9780838911723)
- Look the field 264 in framework, save record
- Open this URL in OPAC
/cgi-bin/koha/unapi?id=koha:biblionumber:41201&format=marcxml
And play with id (the number of new record for Maxwell book) &
format parameters
Test format=rdfdc, format=srw_dc and format=oai_dc
- Notice that <dc:publisher> and <dc:date> are not present
- Apply this patch
- Reload the URL for the three formats
- You will see the tags publisher and date are taken from 264
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
7d16555427db2ee3bf39840df43f134e369ff113)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
65e8776f013a6727b88cdaca900a28ea1ed8aaf0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Martin Renvoize [Fri, 18 Sep 2015 08:10:27 +0000 (08:10 +0000)]
Bug 14034: Fix logout on refresh for shibboleth
This is similar to bug 12877
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
While this is missing a detailed test plan, what I did to test was
1/ Login to koha .. it works
2/ Apply patch
3/ Login to koha .. it still works, no regressions. I can't test the
shibboleth part but it doesnt break anything else so I'm happy to sign
off
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
We had to implement this fix for one of our customers using Shibboleth.
Can verify that it fixes the issue (which, incidentally, breaks
stage-marc-import since that depends on a constant sessionID).
Passing QA (verified with QA tools). Thanks, Martin!
Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
(cherry picked from commit
5c581ccdd0a2fc3ea49d941f2860ac1dd9953007)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
f299790bd9b1ff5a27ecd6d86b442ffe81cac8b5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 02:01:18 +0000 (03:01 +0100)]
Bug 14397: Fix tiny typo in database documentation
Fixes Foriegn to Foreign.
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
89a058787a58295193a60c1a1fbb8b5b5262e7ed)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
ede83df30b3a8f7c52ae8a2ba6de99fde3117953)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Thu, 31 Dec 2015 11:23:42 +0000 (11:23 +0000)]
Bug 15383 [QA Followup] - Change language used
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
58699d77e75dbbf955aa5f28f0ac489539fabe49)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
9f7432a480aee27ba4add9430ef609c595b48b86)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 15 Dec 2015 16:06:17 +0000 (17:06 +0100)]
Bug 15383 - Opac: Autority details: Fix translation issues with a tags
Fix translation issue in opac-auth-detail.tt and opac-auth-MARCdetail.tt
(string splitting by link tag) making it hard to have a gramaticaly correct
translation.
To test:
- Apply patch
- In OPAC, go to search an Authority and display details (View full heading)
- Verify the line "Usage in records: x" in both Normal view and MARC view
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Not sure if "Usage in records" is the best wording, but I have no great
options either, "Number of records used in:"?
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
3d3c53ec017b6973e2cf1b27830c67fac95c7724)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2316c94fe665d843ef2c3dcc70d97de00a3f86c2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 5 Nov 2015 11:32:47 +0000 (11:32 +0000)]
Bug 15138: Fix typo timestamap
Introduced by bug 14426, should be backported to all supported stable
version (3.14, 3.16, 3.18 and 3.20).
Test plan:
got on Home › Reports › Patrons with no checkouts
Fill the Not checked out since,
you will never get any result, a sql error is in the log
Unknown column 'issues.timestamap' in 'where clause'
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Thu, 31 Dec 2015 11:43:54 +0000 (11:43 +0000)]
Bug 15344: Remove one occurrence in circ/circulation.pl
In C4::Circulation::CanBookBeIssued, $borrower->{flags} is called and
should be populated by GetMemberDetails
It fixes the following error on checking out:
Can't use string ("
1900156") as a HASH ref while "strict refs" in use at
/home/koha/src/C4/Circulation.pm line 813.
Note: Error occurs with patrons with staff permissions, not with 'normal' patrons.
Error is fixed with this patch.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Thu, 31 Dec 2015 18:25:10 +0000 (19:25 +0100)]
Bug 15429 Followup to avoid test failing
Nicole C. Engard [Mon, 7 Dec 2015 19:15:04 +0000 (13:15 -0600)]
Bug 13136: Add missing help file for label-manage.pl
This patch adds in a help file for the new label-manage page.
To test:
* visit label creator
* click manage and choose an option
* click 'help' and confirm the file loads
* repeat for all options under manage
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised. Tab char corrected
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
8a02409d180d4e4be8a2d9bef6be5373a8b1a907)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
1dcb57f84e8fa84a80f53be2bbcc0078d232eaed)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Olli-Antti Kivilahti [Thu, 29 Oct 2015 13:40:50 +0000 (15:40 +0200)]
Bug 15080 - ./translate tool should tell if xgettext executable is missing
Just upgraded our Koha container to 14.04 and noticing the
misc/translator/translate doesn't work. This is because of a missing
package gettext.
This patch makes ./translate die with a helpful suggestion to install
gettext if xgettext-program is missing.
Signed-off-by: Frederic Demians <f.demians@tamil.fr>
I can reproduce the bug by desinstalling 'gettext' package on a Debian
box. I confirm that without this patch, 'translate' command fails
miserably. Suggesting to install gettext package is welcomed.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jesse Weaver <jweaver@bywatersolutions.com>
(cherry picked from commit
37b0e2ce9cbc4ba5070d22c96b357ddea1db084b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
52a9bed15f91699981b27cc78fee54fd9bd378df)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mirko Tietgen [Fri, 18 Dec 2015 09:24:29 +0000 (10:24 +0100)]
Bug 15396: fix MARC21 Leader plugin label '1-4 Record size'
The plugin label says "1-4 Record size", but it's actually 0-4.
http://www.loc.gov/marc/bibliographic/bdleader.html
Test plan:
-apply patch
-in cataloging, open a record in a framework that uses the plugin
-open LEADER/000 and check that the label says "0-4 Record size" now
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Good catch, fixed tab, no errors.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
4e61aa5ef55e214e60920eb3556f0c96dbe3e23a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2763eb87de9a234d0ba8e84042ed26bfa7fbdadc)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 01:52:02 +0000 (02:52 +0100)]
Bug 14853: Change 'Fund' to 'Shipping fund'
Changes the 'Fund' to 'Shipping fund' so it's clear
what the fund setting is used for.
To test:
- Receive a new shipment
- Verify that 'Shipping fund' displays on the parcels page
- Search for your invoice
- View invoice details
- Verify that 'Shipping fund' displays on the invoice page
Followed test plan (changed lines: '...cost' -> '...fund')
Display OK on both places.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
3f68107b1012e47467d1fb96b44347499332ba22)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
855cd2a40080a39eeb35d3977a62c0f6909e5218)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 9 Dec 2015 15:10:10 +0000 (16:10 +0100)]
Bug 15340: Translatability: fix issue with 'or choose' splitted by <strong> tag
This patch fixes a translatability issue due to <trong> tags.
To verify:
- Make sure that you have some entries in 'Cities and Towns'
( Home > Administration > Cities )
- Edit the main address of a patron's details
- Locate field "City", at the right you have the text 'or choose'
followed by a drop-down ('choose' is bold)
- change language e.g. to German, the text reads 'or auswählen'
(instead of 'oder auswählen')
- This is due to the <strong> tags around 'choose'
To test:
- Apply patch
- Verify that the <strong> tags around 'choose' are removed in:
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Obvious issue/solution
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
a85fd85545a885e8ebbcc417b7f180baede70304)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
e33bcec68855397ca16f352ff63c85e3789bea36)
Kyle M Hall [Tue, 22 Dec 2015 15:37:41 +0000 (15:37 +0000)]
Bug 15409 - Plugins section missing from Admin menu sidebar
The sidebar menu in the Admin area of Koha is missing a section for
Plugins.
Test Plan:
1) Apply this patch
2) Log in with a user that has plugin permissions
3) Browse to a page with the admin menu sidebar, such as
/cgi-bin/koha/admin/transport-cost-matrix.pl
4) Note the new Plugins section with a link to manage plugins
5) Log in with a user that has no plugin permissions
6) Revisit the same page, note the Plugins section is no longer visible
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
65d3203525470d8b0b44374bdc66b979de57c426)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2f7f6e9ac01476e4a7a6acee829a1fc33985c2a2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 28 Dec 2015 15:00:54 +0000 (16:00 +0100)]
Bug 15432: t/db_dependent/Letters.t depends on external data/configuration
To test:
- Set system preference LetterLog to 'Don't log'
- prove t/db_dependent/Letters.t
- Result: Fails on test 62 - Successfully sent claim
- Apply patch
- Test again
- Result: Pass OK
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: removed the bug reference, not needed.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
c92b1556ef9250d7e038dce2d083c60415035b95)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
99fc3af0a6b13b83ada683cccce025c0c0dbc224)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Sun, 20 Dec 2015 19:57:54 +0000 (19:57 +0000)]
Bug 15373: More changes of Zip to ZIP on intranet
To test:
- Log in to Staff Interface, go to Administration, Libraries and Groups (cgi-bin/koha/admin/branches.pl). Click 'New library' and confirm that it says 'ZIP/Postal Code:' in the form.
- Go back to Administration, Cities and towns (cgi-bin/koha/admin/cities.pl). Confirm it says 'ZIP/Postal code' in table heading. Click 'New city' and confirm it says 'ZIP/Postal code:' in form
- Go back to Administration, Global system preferences, I18L/L10N (cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n). Under AddressFormat, confirm all available options say '[ZIP/Postal Code]'
- Go to Reports, Patrons (cgi-bin/koha/reports/borrowers_stats.pl). Confirm it says 'ZIP/Postal code' under Title
- Go to Tools, Batch patron modification (cgi-bin/koha/tools/modborrowers.pl), enter any card number and click 'Continue'. Confirm it says 'ZIP/Postal code' in the table of patron details, and in the form to edit
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with first patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
5df49b04ef69ad6b33b3f7744acb379c0dd83b0f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
776f738382010f2d9ce8eef7efc73ed5fca45d6c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Mon, 14 Dec 2015 22:43:26 +0000 (22:43 +0000)]
Bug 15373: Changing Zip to ZIP on OPAC and Intranet
To test:
1) Login to OPAC --> You personal details.
2) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
3) Login to Staff interface --> Go to a member's page (ie koha/members/memberentry.pl) --> Details.
4) Ensure it says 'ZIP/Postal Code' under Alternate address and Alternative contact
5) Click Edit
6) Ensure it says 'ZIP/Postal Code' under Main Address, Alternate Address and Alternate Contact
Signed-off-by: Barry Cannon <bc@interleaf.ie>
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
NOTE: Tested together with second patch.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
3da8abcfeff331d5022ee54bbf27ecfbc4ebe18c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
6438df72872d88c263b4fa331c2d44adb0ac2fa4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Mark Tompsett [Tue, 15 Dec 2015 15:15:25 +0000 (10:15 -0500)]
Bug 15382: 245$a visibility constraints not respected in opac-MARCdetail.pl
This tiny change determines if the bibliotitle should be set or not
in accordance with the 'Advanced constraints' visiblity setting for
OPAC.
TEST PLAN
---------
1) Find a record detail in OPAC
2) Click 'MARC view'
-- 245$a should be visible.
3) In a new tab, log into the staff client
4) Click 'Koha administration'
5) Click 'MARC bibliographic framework'
6) Click 'MARC structure' for the framework of
the record displayed in OPAC.
7) Search for tag: 245, and click 'Search'
8) Click 'Subfields'
9) Click 'Edit' beside the a subfield.
10) Click 'Advanced constraints'
11) Uncheck 'OPAC'
12) Click 'Save changes'
13) In the OPAC tab, refresh
-- 245$a (Title) will still be visible!
14) Apply this patch
15) In the OPAC tab, refresh
-- 245$a (Title) will be hidden.
16) In the staff client, navigate back to
'Advanced constraints' and check 'OPAC'
17) Click 'Save changes'
18) In the OPAC tab, refresh
-- 245$a (Title) will be visible again.
19) Run koha qa tools
Signed-off-by: Aleisha <aleishaamohia@hotmail.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
d827bb50d93a83c0ab7ce326675284bee411959a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
7f708a361b95c449a972b8571acde4c52d3f336b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Owen Leonard [Sat, 5 Dec 2015 01:37:47 +0000 (20:37 -0500)]
Bug 15327: Minor tweaks to Bootstrap modal handling on Staged MARC management page
This patch makes a couple of minor corrections to the template for
staged MARC management. The MARC preview is now formatted using the
"html" option, and some obsolete Greybox-related code has been removed.
To test:
1. Apply the patch and go to Tools -> Staged MARC management.
2. Click any staged MARC file containing multiple records.
3. Click the title in the "Citation" column and confirm that a Bootstrap
modal is triggered showing the correct data.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Modal looks much better. Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
23c7de2bc7af7d2d8bf725e536f665bf78116065)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
53cebcb07d8e5c58aa4f9e9da25e9be11444ee51)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nicholas van Oudtshoorn [Tue, 22 Dec 2015 03:44:13 +0000 (11:44 +0800)]
Bug 15405 - XML paths to zebra libraries is wrong for 64-bit installs on non-Debian linux
Adjusts the modulePath to search in the well-known location for 64 bit
systems. Required for at least Fedora.
Test plan:
Without this patch, doing a zebra reindex on a fedora-based install will
cause errors like this:
15:10:47-01/05 zebraidx(16108) [warn] No such record type: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
With this patch, reindexing should just work.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
I have tested this doesn't break on debian/ubuntu systems, someone with
a non debian system will need to test it on that
Signed-off-by: Bob Ewart bob-ewart@bobsown.com
It works on openSUSE Leap 42.1
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Just noting that the debian zebra files already contain much more paths
here.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
3d7bb7647dd42f9c05e8b4c35ec32cd15ec4dcc4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
9c302d9c09c2c30824c3e4a1c934a5c76883cb4c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Wed, 30 Dec 2015 12:10:16 +0000 (13:10 +0100)]
Bug 15429 UT for _parseletter modifying its parameter
Before/after applying the related patch, do:
prove -v t/db_dependent/Letters.t
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
fd07e3296b64a78edf1cf947a824147f1adbba1a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
2eac97ba65d869f34641f6eb7fd22047a104a794)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Mon, 28 Dec 2015 09:29:17 +0000 (10:29 +0100)]
Bug 15429 - sub _parseletter should not change referenced values
In C4/Letters.pm, sub _parseletter changes values that are passed by
reference. E.g. patron's expiry date can change from iso format to
syspref format, leading to strange behaviour in the calling routines
(see Bug 15423).
This patch makes sub _parseletter work on a copy of the referenced values.
(Submitted to get feedback - is this the way to go?)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Good solution to real time bomb.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
002a2dcb1f1faed12a24fd820dc5fdaad60f3512)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
cc3b2d05905b8c6c7000a0252e277c151c0eeae6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Wed, 25 Nov 2015 13:02:05 +0000 (14:02 +0100)]
Bug 15252 - Add tests
Tested 4 patches together, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
f0da781368a187337236d64ee94d9c8cc65f90f7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
638a6343f653fdf0a04504ada952d01978d4733a)
Fridolin Somers [Wed, 25 Nov 2015 11:34:18 +0000 (12:34 +0100)]
Bug 15252 - Patron search on start with does not work with several terms
When searching a patron, search type can be 'start with' and 'contain'.
If the search text contains a space (or a coma), this text is splitted into several terms.
Actually, the search on 'start with' with several terms never returns a result.
It is because the search composes an "AND" SQL query on terms.
For example (I display only the surname part) :
search type = contain :
'jean paul' => surname like '%jean% AND %paul%'
search type = start with :
'jean paul' => surname like 'jean% AND paul%'
The query for 'start with' is impossible.
I propose, for search with start with, to not split terms :
jean paul => surname like 'jean paul%'
One can always use '*' to add more truncation :
jea* pau* => surname like 'jea% pau%'
This bug affects a lot surnames with several terms like 'LE GUELEC' or 'MAC BETH'.
Note that the patch moves :
$searchmember =~ s/,/ /g;
It removes the test "if $searchmember" because $searchmember is tested and set to empty string previously :
unless ( $searchmember ) {
$searchmember = $dt_params->{sSearch} // '';
}
Test plan :
==========
- Create two patrons with firstname "Jean Paul"
- Go to Patrons module
- Choose "Starts with" in "Search type" filter
- Perform a search on "Jean Paul"
=> without patch : you get no result
=> with this patch : you get the two results
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you do not get results for search on "Jea Paul"
- Choose "Contains" in "Search type" filter
- Check you get the two results for search on "Jean Paul"
- Check you get the two results for search on "Jean Pau"
- Check you get the two results for search on "Jea* Pau*"
- Check you get the two results for search on "Jea Paul"
- Check you get the two results for search on "Paul Jean"
Signed-off-by: Alex <alexklbuckley@gmail.com>
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>
Bug 15252 - Patron search on start with does not work with several terms - followup 1
'start_with' is the default value of $searchtype, it can be explicit.
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>
Bug 15252 - correct UT searchtype value is contain and not contains
Tested 4 patches together, works as expected
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
a4f5564c855e31f6872fb5e3ef378381473f837c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
db50ac5b8c6c72d15f4c5e2a96544abde432b0f6)
Jonathan Druart [Wed, 2 Dec 2015 11:38:27 +0000 (11:38 +0000)]
Bug 14636: Remove debug message
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
9b9fb3ee0555cd51007af669f753f0a0e5ec661e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
05e70e2e48d37ae0c68fcb82117e3d120710810f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Wed, 25 Nov 2015 17:00:33 +0000 (18:00 +0100)]
Bug 14636: Follow-up - fix typo in system preference name
The preference is named "marcflavour" not "marcflavor".
Without this change, search will always use "copyrightyear"
and break search by publication date for UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
99a1d7f18a43a089d49d36b167cc1537fa058f79)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
42f3e0d9ed845a8b44ac0bc3f8d5153811acab34)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Wed, 25 Nov 2015 16:06:01 +0000 (17:06 +0100)]
Bug 14636: Item search - biblioitems column is publicationyear not publicationdate
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow-up!
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
2d0d71730163fbd13583532de622574737e34221)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
5c945298900413b7807fe1f1e79694feafba31f1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sat, 21 Nov 2015 21:37:03 +0000 (22:37 +0100)]
Bug 14636: Item search - improving display
- Changes "Publication Date" to "Publication date"
in the CSV export
- Fixes 'no JavaScript fallback' display to match
the normal display
- only show 'by' when it's UNIMARC and an author
exist
- show copyrightdate if publicationyear is empty
To test:
- Turn of Javascript in your browser before you
item search. This will activate the alternative
display.
- For MARC21:
- Verify that the author displays when existing
and no 'by' is shown.
- Verify that the publication date is now shown.
- For UNIMARC:
- Verify that 'by' only displays when there is
an author to display.
- Verify that the publication date is still
shown.
- Try the CSV export.
- Verify that the CSV header now reads 'Publication date'.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Successfully tested non-JS behavior and CSV export. DID NOT test
UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
2aa6518c8a000a824e2659eaffc3d1ac54156544)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
704e932d648c66ad81c0f79d8ae6b388595bcbcf)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sat, 21 Nov 2015 21:32:52 +0000 (22:32 +0100)]
Bug 14636: Item search - fix search and sort by publication date for MARC21
Problem: MARC21/NORMARC stores the publication
date in biblio.copyrightdate, but UNIMARC uses
biblioitems.publicationyear.
To test:
- Without patch in a MARC21 installation:
- Search by publication date
- Verify that the results don't match the
publication year you searched for.
- Try sorting the table by publication year.
- Verify that the sort doesn't work.
- Apply patch.
- Repeat both, search and sort.
- Verify both work correctly now.
- Repeat tests on a UNIMARC installation.
- Verify both still work.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested searching and sorting successfully in a MARC21 installation. DID
NOT test in UNIMARC.
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
0d2e83bca5b91376e9262b6cb0b993f09b919018)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
d772f8732c9623e246a0fad33fef5282c044f368)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 9 Dec 2015 17:41:04 +0000 (17:41 +0000)]
Bug 15344: Remove some other calls of GetMemberDetails from pl scripts
Same as previously.
For these files it's a bit less obvious.
To make sure these changes won't introduce any regression, check that
the variable returned by GetMember is never used to get something
else than a borrower fields.
The 'flags' should not be get neither.
For opac-user.tt it's different, other keys are got but there are defined
in the pl script.
On the way:
- 'showname' is removed (never used)
- fix scope var issue in opac-user.tt (BORROWER_INF.OPACPatronDetails vs
OPACPatronDetails)
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
010a32d95f871853f5c597b2670f3de4c62cfa51)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
95e9dafa38bf6f895cf62feac1df20e3b67a0640)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 9 Dec 2015 17:00:10 +0000 (17:00 +0000)]
Bug 15344: Remove unucessary call to GetMemberDetails
This subroutine does a lot a processing and should only be called when
necessary.
In the get_template_and_user subroutine (so called from any pages of
Koha), it is call to pass the branchcode, title, firstname, surname and
borrowernumber values for the logged in user.
This subroutine calls GetMemberAccountRecords which retrieve the items
infos for all accountlines entries of the logged in user.
On members/members.pl, let's say you have 74 entries in the accountlines
tables, the page will execute 115 SELECT instead of 35 if you don't have any
accountlines entries.
With this patch, the number of SELECT is always 31.
To test this patch you should have technical skills to know what to do.
Note that USER_INFO was an array of... 1 element. Now it's a hashref.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
ac541e0fa1c11254e110d94eed64c358e02e8aab)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
44202df6acdfcfb371eccc6b8e8007a871304e49)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 4 Oct 2015 09:38:03 +0000 (11:38 +0200)]
Bug 14948 - Display amounts right aligned in tables on patron pages
This patch set display amounts for charge, fine, price etc. right aligned in tables
on patron pages.
To test, apply patch and verify that amounts appear right aligned on following pages:
- Go to Home > Patrons, perform a search (Column 'Fines')
- Go to a patron with fines and credits
- Checkout tab (circulation.pl): Columns 'Charge', 'Fine', 'Price'
(maybe you have to show column with 'Show / hide colums')
- Fines Tab > Pay fines (pay.pl): Columns 'Amount', 'Amount Outstanding'
- Fines Tab > Account (boraccount.pl): Columns 'Amount', 'Outstanding'
Note: Test here 'Filter paid transactions' as well
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
1acc6094be7670c180bc006182a0f8e464abac03)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
fdb0cc80dbd323f8b7d60bb57af1e9bc6d126086)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Aleisha [Sun, 13 Dec 2015 22:24:05 +0000 (22:24 +0000)]
Bug 14153: Noisy warns in admin/transport-cost-matrix.pl
To test:
1) Go to Admin -> Transport cost matrix
2) Notice the warns in the error log
3) Apply the patch and refresh page
4) Notice page still works but no warns in error log
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Init a $op variable, if it must be reused later.
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
825d68ee8696a2c3f3a2a95c0d148015f02a5ae9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
21465d93d57b197429ebf33d753b9d971e82bac3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nick [Wed, 18 Nov 2015 16:49:15 +0000 (11:49 -0500)]
Bug 15210 - Novelist throws an error if no ISBN
This patch makes opac-detail.tt check for an ISBN before attempting to load
Novelist content and prevents a js error which breaks other code.
To test:
1 - Enable novelist
2 - Add a visible change to OPACUserJS eg: $(document).ready(function()
{$("body").css("background-color","pink");}); 3 - Load a record with no ISBN
4 - Note you do not see a color change in the body and that there is an error
in the console 5 - Apply patch
6 - Reload the record
7 - You should see the color change and no error in the js
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
65c5fa4385a8e080cfd46a8197b4417bcd579b6a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
77bd7557fa7adb196ed46fd7ae3ceea98db3a67c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Wed, 30 Dec 2015 14:26:35 +0000 (14:26 +0000)]
Bug 15442 - Checkouts table will not display due to javascript error
Uncaught ReferenceError: AllowCirculate is not defined
Test Plan:
1) Go to circulation.pl for a patron, note the checkouts table
does not load
2) Apply this patch
3) Reload the page, checkouts table should show
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
c7339799ff994fffdb9273bd71951f8c2d60d1ec)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
14ee2557daafbb67b3afa541fc69f60fa21e7229)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Fri, 18 Dec 2015 15:01:15 +0000 (15:01 +0000)]
Bug 15332: Sent DateTime object to DBIx::Class, not formatted dates
If formatted dates are sent to DBIx::Class on update/insert, the date
will be set as 0000-00-00 (except if the format is yyyy-mm-dd).
Test plan:
Use the batch patron modification tools to update the dateenrolled or
dateexpiry values for at least 1 patron.
Without this patch, the modified value will be updated to 0000-00-00,
with this patch, the correct value will be set.
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
af7fb9cd48cdb47329e7b9bbe651e856e017aa13)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
d5fd02e4a17383e984c31e427dc2c64ce4726b51)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Colin Campbell [Thu, 19 Nov 2015 14:17:10 +0000 (14:17 +0000)]
Bug 15217 Remove redundant duplicate var declaration
remove superfluous second declaration of template, borrowernumber and
cookie which are never used
Also removed the variables @results and @results_array which are
declared but not used
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
As suggested by Colin, perl -wc catalogue/search.pl doesn't complain
anymore after applying the patch. perlcritic confirms the 2 variables
were unused.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
558f291465d60c082c0e9a4a15eb7ed87a3e3fde)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
141f30d406671330bf31b199b4cdb78414176111)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Mon, 23 Nov 2015 01:52:39 +0000 (19:52 -0600)]
Bug 15228: Switch "Items in batch number"
Yet another line to switch "Items in batch number" to
"Patrons in batch number"
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
e89714ea84acd8300a629a7acccc6eee90ff0ff0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
008e3805ff1f6b59422286a33b55f4b509edca87)
Jonathan Druart [Wed, 25 Nov 2015 16:45:50 +0000 (16:45 +0000)]
Bug 15101: Correct typo AllowPkiAuth vs AllowPKIAuth
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
d36280e36e1fa8779bf845fb0cc0de2ea835d486)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
87ce8e85ec6d4c8a447a4d595bf3b975a9ea3cb3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 01:43:36 +0000 (02:43 +0100)]
Bug 15101: Don't display sys pref AllowPkiAuth under CAS heading
The system preference AllowPkiAuth display under the heading
CAS authentication, but is actually a separate authentication
option. Patch creates a separate heading for it.
To test:
- Go to Administration > System preferences > Tab Administration
- Verify that AllowPkiAuth is now displayed separately
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
cee796629fb131966a8ebfa77ecbcf054c46fd02)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
30bfb13466e875205f8052590e800247fb263952)
Jonathan Druart [Wed, 25 Nov 2015 16:14:35 +0000 (16:14 +0000)]
Bug 15229: Same fix for circulation.tt template (normal checkouts)
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
acf586a45ab4a27939f0ba34cba58ae8ff500993)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
b1e931f7bbcc7e9c0b03ca59a96fc0a67027191c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nicole C. Engard [Thu, 19 Nov 2015 15:31:01 +0000 (09:31 -0600)]
Bug 15220: Fix typo in circ rules help
MaxFinesystem should be MaxFine system
To test:
* visit circ & fine rules
* click help
* confirm typo fixed
Signed-off-by: Thomas Misilo <misilot@fit.edu>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
391c8ec0bc682491faaf64494867237dfc01bd11)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
a55557afc0f410da4b106e71362801036774c4c4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 02:25:56 +0000 (03:25 +0100)]
Bug 15238: Better translatability for Installer Step 1
This Bug streamlines html in installer/step1.tt for better translatibility.
To test:
Reviwe code and verify that changes in text make sense.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
To reproduce in Debian environment, remove a required module with
dpkg -r. Rewording Ok for translation purposes
Bug 15238: (followup) Remove word 'Note:'
'Note: ' removed as requested in comment #3
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Word 'Note' removed
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
29a4300c0727b779e1a0e83a35cd772828debde2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
8a7bd3aa361ce707fd5e9fd478c7d7bbd0647312)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 02:09:55 +0000 (03:09 +0100)]
Bug 15237: Quote of the day: Better translatibility for editor and help
This patch moves html markup out of explanatory text in Quote of the day editor and help
for better translatibility (Home > Tools > Quote Editor).
To test:
- Apply patch
- Go to Home > Tools > Quote Editor and related Help
- Verify that text changes make sense.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Make consistent space after "Note:" (inside the br tag)
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
b0e833f9f5bffeb0940dd75eae150a247b5b520c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
53f4b7241c27b36b52571f14d3b1186e6b401c01)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 01:32:30 +0000 (02:32 +0100)]
Bug 15236: Better translatibility in "Connect biblio.biblionumber to a MARC subfield"
This patch moves html markup out of explanatory sentence in koha2marclinks.tt ("Connect
biblio.biblionumber to a MARC subfield") for better translatability.
To test:
- Apply patch
- Go to Home > Administration < Koha to MARC mapping
and edit a tag
- Verify that text change makes sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
f9586b01998071ddfdfc130ead2f48b079ae7e68)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
ae929c528367c135317d3058794028067b97ac90)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 2 Dec 2015 23:10:28 +0000 (00:10 +0100)]
Bug 15233: (followup) Remove 2 sentences.
This patch removes 2 sentences (see comment #8)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
8f77dc86cec51f0f4eea1d627d82fd6b17499060)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
722b953d0c8a8d907333e1cda43e6ed45c02b91e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sat, 21 Nov 2015 01:10:24 +0000 (02:10 +0100)]
Bug 15233: Cataloging subfield editors: Clean up html and streamline text for better translatability
This patch removes bold markup from explanatory text in auth_subfields_structure.tt
and makes it the same as in marc_subfields_structure.tt for better translatibility.
To test:
- Apply patch
- Verify that string changes make sense and that the explanatory text is the same in both files.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
9b0d9a186a7bffc16af2e5b2f67de31eb468a7a5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
e10046a351ed9681a18b5eaf21ba320f833b057e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 2 Dec 2015 05:33:32 +0000 (06:33 +0100)]
Bug 15231: (followup) Remove stray </b> tag
This patch removes a stray </b> tag (see comment #4) and a superfluous blank.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
ea0d5aa6bf7b0ff96fc75f04d6cb83dc37d4136a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
78f47f5dc89699aa388b915a3cad81cf375f2fbc)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Fri, 20 Nov 2015 21:58:40 +0000 (22:58 +0100)]
Bug 15231 - Import patrons: Remove string splitting by html tags to avoid weird translations
Some of the strings in Home > Tools > Import patrons contain html tags and therefore are
splitted in the translation tool. This makes it nearly impossible to create correct translations
from the partial strings.
Additinally, the notes for Extended patron attributes never displayed (due to a bug).
To test:
- Apply patch
- Enable Syspref 'ExtendedPAtronAttributes'
- Go to Home > Tools > Import patrons and verify, that the Notes at the right of the
screen make sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Split html tags removed, notes at right side it displayed correctly
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
5843c76546d5769493099faed2fbce39fbe3b6f3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
d1e8b93f66b8aa800b5d552f7039effaa9dc9e53)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 2 Dec 2015 11:39:59 +0000 (12:39 +0100)]
Bug 15300: Translatability: Replace ambiguous 'From' and 'To' in members-update.tt
This patch replaces semantically ambigous words "From" and "To" in
koha-tmpl/intranet-tmpl/prog/en/modules/members/members-update.tt
for better translatability.
To test:
- Apply patch
- Make sure that patrons can request detail changes in OPAC
(sysprefs opacuserlogin, OPACPatronDetails)
- Log in to OPAC, request a change of personal details
(cgi-bin/koha/opac-memberentry.pl)
- Log in to staff client
- Click link 'Patrons requesting modifications' or go to
Home > Patrons > Update patron records
- Verify that table headers make sense
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rewording Ok for translation purpose
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
b07513526965720c7d558bd9c6176088304a2ee9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
d8aa61c574022e842a9921beaa2fe723891b895d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 21:39:53 +0000 (22:39 +0100)]
Bug 15366 - Fix breadcrumbs and html page title in guided reports
This patch fixes following issues with breadcrumbs and html page title
in Home > Reports > Guided reports wizard:
- Sometimes, breadcrumbs display a stray > at the end
- While creating a report, steps are not displayed in breadcrumbs and
do not appear in html page title
- html page title is divided by newlines
To test:
- Apply patch
- Go to Home > Reports > Guided reports wizard
- Go to all pages including the steps for creating a new report and
verify
- that the breadcrumbs display properly and make sense
- in html source, the page title makes sense and displays on one line.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
639ccd469f4e00e1737e0dec6ee914d845907938)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
c7028a02b5158591665a35421b4a80f54f5324f3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 19:34:46 +0000 (20:34 +0100)]
Bug 15365: Translatability: Fix issue on Administration > Circulation and fine rules
Fix translatability issue on smart-rules.tt to prevent odd translations (Sentences
splitted by tags and newlines).
To test:
- Apply patch
- Go to Administration > Circulation and fine rules
- Verify that the lines "Note: " and "Important: " below "Default holds policy by
item type" make sense and are not splitted by tags and (in html) by newlines.
(Amended to fix commit message)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
strong Note and Important displayed Ok for translation purpose
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
bc2e4ba86208e26d9890868d6deb5c65c263e907)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
0eff941b1b28ae1db1a2e11345a6d7cfb9616c3f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 10:58:52 +0000 (11:58 +0100)]
Bug 15363: Translatability: Fix issue with ambiguous 'all' on Administration > Set library checkin and transfer policy
In branch_transfer_limits.tt, set ambiguous word 'all' (separated by tags) into a
translatable context.
To test:
Apply patch
- Go to Home > Administration > Set library checkin and transfer policy
- Verify that the word 'all' is no longer separated by tags
in "For all collection codes: " rsp. "For all item types: "
(Switch with syspref 'BranchTransfersLimitsType')
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works well for translation purpose
Bug 15363: (followup) Move tags inside if statements
Followup for comment #3
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
27363271be4b4cc308572dcf04049edf33fa1a7c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
88d1dfcfffcb66ffde3b4ecdebc9b9e5876bc076)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Sun, 13 Dec 2015 09:47:53 +0000 (10:47 +0100)]
Bug 15362: Translatability: Fix issue on Administration 'Did you mean?'
Fix sentence splitting by tags on didyoumean.tt leading to odd translations.
To test:
- Apply patch
- Go to Home > Administration > Did you mean?
- Verify that the information below the title displays properly and makes sense.
- Disable Javascript, reload page
- Verify that the warning about missing Javascript displays properly and makes sense.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as descrived. Removed em tags for translation purpose
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
984f641417e20ab561b2670b5ed921dc4aa6a907)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
40724deeb8ebd36e9be5253f47d16396230191e4)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 9 Dec 2015 20:31:29 +0000 (21:31 +0100)]
Bug 15346: Translatability: fix sentence splitting issue in memberentrygen.tt
Fix sentences in memberentrygen.tt that are split by <strong> tags, leading to
wrong capitalization in German (because it can not be decided if a string is part
of a sentence or a standalone sentence).
Example: Es sind Keine Bibliotheken definiert.
To test:
- Apply patch
- To trigger the messages, you have to edit a patron in a system where
no libraries and no patron categories are defined
- Alternatively, carefully review the changes in
koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Sentences fixed for translation purposes
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
698fb010f55c0d68789299003f4ac55326142f72)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
ec2e2f6d0b9d4b376b59d24e7895ad767d8fff97)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Wed, 9 Dec 2015 17:36:21 +0000 (18:36 +0100)]
Bug 15345: Translatability: fix issue in facets (Availability')
This patch fixes an issue with a splitted sentence in facets (Avalability)
that leads to weird translations e.g.:
German: 'Zeige nur Verfügbar Exemplare'
French: 'Montrer seulement disponible exemplaires'
Additionally, the link "Show all items" gets it's own li tags to display
nicely like the other links in the facets column and it removes superfluous
dots.
To test in OPAC and Staff client:
- Apply patch
- Do a search that results in more than one available items
- In column "Refine your search", click on "Limit to currently available
items"
- Verify that the message "Showing only available items" and the link
"Show all items" display nicely.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
use_zebra_facets set to 0 in koha-conf.xml to test. Works as described
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit
5e80a64ea39140c9918335fc472a441bb3fa9c6a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
3951a8fffd4d9b6ecb22a8382878c79225e6d2ca)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Julian Maurice [Tue, 1 Sep 2015 07:46:35 +0000 (09:46 +0200)]
Bug 14363: OAI-PMH: Handle records without marcxml
Test plan:
1/ git checkout 3.18.x
2/ GET http://OPAC/cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=marcxml
3/ Take the first biblionumber from the results ($biblionumber)
4/ mysql> update biblioitems set marcxml=null where biblionumber=$biblionumber
5/ Repeat step 2 => XML error
6/ Apply patch
7/ Repeat step 2 => no errors
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Works on 3.20.x
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Fix works for 3.18.x and 3.20.x
3.22 is not impacted
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Tue, 29 Dec 2015 14:46:17 +0000 (15:46 +0100)]
Track down last 3 failing tests on Jenkins
- Fix t/DateUtils.t
- t/db_dependent/TestBuilder.t
Upgrade this test verbosity in order to find out on which data source
it fails on Jenkins.
Frédéric Demians [Tue, 29 Dec 2015 10:28:20 +0000 (11:28 +0100)]
Fix various failing tests on 3.20.x branch
- t/db_dependant/Contract.t
- t/db_dependent/Circulation_issue.t
- t/db_dependent/Holds.t
- t/Auth_with_shibboleth.t
Frédéric Demians [Tue, 29 Dec 2015 09:44:44 +0000 (10:44 +0100)]
Revert "Bug 15171: Display subscriptions which will expire in the future"
This reverts commit
7368075d1e3640396ed64a5ed342147a5d31fa22.
Fix test
Tomas Cohen Arazi [Mon, 28 Dec 2015 13:57:41 +0000 (10:57 -0300)]
Bug 15431: svc/checkouts dies due to undefined variable (13024 merge problem)
When bug 13024 was merged into 3.20.x, a bug was introduced by replacing the
old way to fetch itemtype descriptions with the newer (3.22+).
To test:
- Perform a checkout on a patron
- Check so all checkouts are shown immediately
=> FAIL: It keeps loading forever. The logs show the svc/checkouts script died
- Apply the patch
- Reload page
=> SUCCESS: It loads the circ information correctly
- Sign off :-D
Regards
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Frédéric Demians [Sat, 26 Dec 2015 18:49:14 +0000 (19:49 +0100)]
Fix Koha.pm 3.20.7 version number
Bernardo Gonzalez Kriegel [Thu, 24 Dec 2015 14:51:53 +0000 (11:51 -0300)]
Translation updates for Koha 3.20 release
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Frédéric Demians [Thu, 24 Dec 2015 15:19:47 +0000 (16:19 +0100)]
Version 3.20.7
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Mon, 20 Apr 2015 19:31:11 +0000 (12:31 -0700)]
Bug 13838 - Redirect to 'expired holds' tab after cancelling a hold
When canceling a hold from the holds over tab, you are redirected back to the holds waiting tab. Instead, we should the librarian should continue to see the list of holds past the waiting length.
Test Plan:
1) Apply this patch
2) Cancel a hold from the "Holds over" tab on circ/waitingreserves.pl
3) Note you are redirected back to the holds over tab
Signed-off-by: Tom Misilo <misilot@fit.edu>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
353e30d73e261a96077917004036c2c01e32c623)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
fddc423c09f2ad1243731e94ee30e9885c9a1e44)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Mon, 16 Nov 2015 12:07:07 +0000 (13:07 +0100)]
Bug 15193 - Perl scripts missing exec permission
Some perl scripts have 644 permissions instead of 755.
I think some are special like install-CPAN.pl.
This patch corrects some common perl scripts.
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
3410608b66fe0dd6e4c94fdcc185c7fb89b619c1)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
bff51cb38c19678533ec11eddf68f5b9e0d74c30)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bernardo Gonzalez Kriegel [Thu, 3 Dec 2015 12:19:17 +0000 (09:19 -0300)]
Bug 14971: fix RIS export
This patch removes a limit in RIS.pm print_isbn sub.
To test:
1) Find in opac a book with an isbn with length(isbn) > 10
(with dashes or isbn13)
2) Export record to RIS format, check truncated SN field
in exported file
3) Apply the patch
4) Export again, no more truncation
Signed-off-by: jvr <jvr@fct.unl.pt>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
906d2108b9054a68168219136d69e6d783f156fb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
f6d9e04b886c3d7d9378732f9cdc3eedffed8659)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 01:31:10 +0000 (02:31 +0100)]
Bug 15202: Fix date display when transferring an order
The date a basket was created was not displayed
according to the dateformat system preference.
Also fixes wording of the message shown when there
are no baskets for a chosen vendor.
To test:
- Create an order with an order line
- Click on the "Transfer" link on the basket
summary page
- Search for a vendor without open baskets
- Verify change of message shown:
"There are no open baskets for this vendor."
- Choose another vendor with open baskets
- Verify the creation date of the basket is
displayed correctly formatted.
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit
f4b8c4ede9c83b1b78eb87c7fb31214299cbf2f2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
ccdc2288a6279aa3745ffa2040cc489c0b71f196)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Blou [Thu, 17 Sep 2015 15:33:38 +0000 (11:33 -0400)]
Bug 14846 - Items with no holdingbranch causes svc/holds to crash
When trying to display the holds for a user, if an item has no
holdingbranch, it causes the svc/holds service to crash and the display
to freeze.
Tentative steps to reproduce on any DB:
1) put 1 or more items on hold for a given user.
2) go into the database and set the item.holdingbranch to NULL
3) In the user's page, in checkouts (circulation.pl), click the tab that
should be written 1 Hold(s)
4) It will be "Processing" indefinitely.
The cause is the svc/holds code that crashes. The fix will validate
that there's an holdingbranch before proceding with the code.
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
c6f7496422a593fdfe4dd2633aed4b190703d03d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
6012bc8b9988bd4cc2b6fbeecb5de32171f193b6)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Marc Véron [Tue, 1 Dec 2015 19:22:27 +0000 (20:22 +0100)]
Bug 15244: t/db_dependent/Reserves.t depends on external data/configuration
Test 14 in t/db_dependent/Reserves.t fails if syspref LocalHoldsPriority is
set to "[Give] priority for filling holds to patrons whose...
To verify:
- Set syspref as above and run test. Test 14 fails.
- Set syspref to [Don't give] and run test agein, it passes OK.
To test:
- Apply patch
- Run test again with syspref set / not set
Expected result: In both cases test should pass
(AMended to change bug title)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
ae5962cab435fe5119cf743a2ea0b9e501985ff9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
dfa650949d50c1c90a3950db9a7d2b6a265e3b76)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Wed, 25 Nov 2015 23:29:34 +0000 (00:29 +0100)]
Bug 15216: Returns - Show collection description
The table of returns displays the collection code
instead of the description. This patch fixes that.
Same as first patch:
To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
a102ccd48f72327d8d84d3782259b1417b75336b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
552a9d066e722711b7049bf3b1864c7771a69719)
Katrin Fischer [Sun, 22 Nov 2015 01:23:11 +0000 (02:23 +0100)]
Bug 15216: Returns - Show branch names and item type description
Changes the table with returned items to display the branch
names for home and holding branch and the itemtype description
instead of the codes.
To test:
- Check out some items
- Return the items
- Verify the changes in the table of returned items
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
84a0f1acf6ef052cc83eb4c0f6c07127b4cfaae2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
efeeffb0645ffd7c2b84629618ad0c60882e8517)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Bernardo Gonzalez Kriegel [Sat, 28 Nov 2015 14:33:37 +0000 (11:33 -0300)]
Bug 11038: Enable use of IntranetUserCSS on staff client login page
This patch enable use of IntranetUserCss on staff client
login page.
To test:
1) Add something to IntranetUserCSS to modify login page,
for example
#login h1 a {
height:30px;
}
2) Logout from staff client, no changes on login page.
3) Apply the patch
4) Reload, now logo is cut in half :)
Bonus) Login again an try changing image, add
#login h1 {
background: url(http://example.com/img/other-logo.png) no-repeat top center;
}
and fix height. Logout and check
This also affects 3.20 and perhaps earlier versions.
Re-upload to fix examples
Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
11e4c42e05090a25bf9fa03275f708d1f1c4fde7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
14dc51472a88796f7bf5579e50174d691e74a28a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Merging issue due to intranetusejs syspref renaming. Fixed.
Katrin Fischer [Sun, 22 Nov 2015 00:18:04 +0000 (01:18 +0100)]
Bug 9184: Acq - Don't show authority batches when ordering from staged file
When ordering from a staged file, the list of files
should only include imports of bilbiographic and
no authority data.
To test - start without the patch:
1) Stage an authority file
2) Stage a bilbiographic file
3) Create a new basked in acquisitions
4) Create a new order line selecting "From a staged file"
5) Verify that both files are shown
6) Apply patch
7) Verify that only the bibliographc file shows
in the list now
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
169015af947e52895e784375c4c654c110c7f1a9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
0fba468262928dddb08d8e49e3e1cff8cb1ff557)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Fridolin Somers [Mon, 23 Nov 2015 08:19:06 +0000 (09:19 +0100)]
Bug 14599 - Saved auth login and password are used in patron creation from
If one save the login and password used to authenticate in staff interface,
when creating a new patron, those login and password are filled in the
corresponding inputs in the form. This behaviour is awkward from web browser.
A trick is provided by
http://stackoverflow.com/questions/
10738090/why-firefox-autocomplete-even-with-different-input-name
I found that the best way is to use an hidden disabled input between userid and
password.
Test plan :
- Log into Koha
- Allow the browser to save the userid/password
- Be sure that you have only one userid/password for this Koha
- Loggout
- Re log to check the browser autocomplets the authentication form
- Create a new patron
=> Without patch your saved userid/password have been added to the form
=> With patch your saved userid/password have not been added to the form
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This is not elegant but it works.
Note that the problem does not exist with Chromium
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
f4870f6666127f0f0b2c49cc4f89cadd0241a8b9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
3f9d68e599f7e5915f8982fd199030c32c3d8cf3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 02:25:58 +0000 (03:25 +0100)]
Bug 14349: Checkouts and Fines tab missing category description on the left
When navigating the tabs in the patron account, for 2 tabs the
patron category description is missing above the tabs.
To test:
- Go to a patron account in staff
- Click through the tabs
- Verify that for Checkouts and Fines the category description
is missing above the tabs
- Apply patch
- Verify the description is now shown
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
9e518de90f3baafc5d44eefd423e3ee2a491c60d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
df1a9a98fd6f3186a05f9eeead63de1e2b3c39ff)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Hector Castro [Thu, 3 Dec 2015 19:20:40 +0000 (13:20 -0600)]
Bug 15290: (follow-up)SQL reports headers encoding problem
Fix SQL row data and headers enconding problem
To test:
-Apply patches
-Follow previous test plan
-Notice the headers and row data is displayed in UTF-8
without double encoding
-Save in Comma separated text, Tab seprated text, and Open Document.
-Verify in the three options the file exported is Ok
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
4f6bcc5cc9c3fff9e009277f20790b6005be005c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
8cc6e1170a167ac11530f0376d616969f412de57)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Tomas Cohen Arazi [Thu, 3 Dec 2015 14:23:54 +0000 (11:23 -0300)]
Bug 15290: SQL reports headers encoding problem
To test:
- Create an SQL report with column names containing UTF characters
- Run the report
=> FAIL: The column names are double encoded
- Export the report
=> FAIL: The column names are double encoded in the exported file
- Apply the patch
- Re-run the report (reload works)
=> SUCCESS: Encoding correct
- Export the report
=> SUCCESS: Encoding correct
- Sign off :-D
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
879b1386ff3a274d0884dc0b48afa6064c35eed7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
333593c011cfe83501516ecf719808b8408b846e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Jonathan Druart [Wed, 25 Nov 2015 16:40:37 +0000 (16:40 +0000)]
Bug 12152: Holds to pull report - Display location descriptions
...instead of their code
Test plan:
Same as before, confirm the the location codes are replaced with their
descriptions.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
a901ed155a56a2c4ab95bb7bc951e2a0a7d04277)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
0ee6451023ca0c973052bcf685e9ab329a390927)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Katrin Fischer [Sun, 22 Nov 2015 02:38:30 +0000 (03:38 +0100)]
Bug 12152: Holds to pull report - Show branch names and item type descriptions
The 'Holds to pull' report shows branch and itemtype codes without
this patch. With the patch, names and descriptions should display.
To test:
- Make sure there are some holds for available items in your system
- Go to Circulation > Holds to pull
- Verify changes mentioned above in the list of holds shown
Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described, although as Magnus mentioned, Locations
still use codes instead of descriptions.
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit
0f7f6a5cb32cd2e68bc39e8464147852347be310)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
773d7e2d1faa449ea1bd6f28d2422a195388686e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Nicholas van Oudtshoorn [Thu, 15 May 2014 05:27:48 +0000 (13:27 +0800)]
BUG 11602: [ENH] Fix localcover display
Adds a css class of thumbnail to local covers.
Don't show the 1px "No image found" image
(since we'll ususally try another image provider)
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Box with "No cover image availabe" fixed when syspref OPACLocalCoverImages
set to display
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit
a06793dc584212dde20f985740691b7e49074c76)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
24ba596672f6537db8fcb5b54bf5017bd6d41a6e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Tue, 1 Dec 2015 17:49:55 +0000 (17:49 +0000)]
Bug 13024 [QA Followup] - Add nonpublic note to relatives' checkouts
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit
fc050984699e6831fdb354c77d065a08567beb9f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
13c4a8e77a0a798fb63edded881d56fdafc874f1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Kyle M Hall [Fri, 24 Apr 2015 14:41:58 +0000 (10:41 -0400)]
Bug 13024 - Nonpublic note not appearing in the staff client
The nonpublic note for items is not displayed in the staff client. It
should be displayed in the following areas:
1) Checkouts (circulation.pl)
2) Checkins (returns.pl)
3) Record details ( moredetail.pl )
Test Plan:
1) Ensure your non-public note field is mapped to the
items.itemnotes_nonpublic database column
2) Edit an item, add a test nonpublic note
3) Check out the item, verify the note is visible in the checkouts table
4) Check in the item, verify the note is visible in the checkins table
5) View the item details, verify the note is visible and editable
if your account has the rights to edit items
Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit
717878982f985b9f40f9eedec5e576efd62976ff)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit
a5b993672fc2b87a51d4944616e5f303992d4f3f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>