Commit graph

15266 commits

Author SHA1 Message Date
Marc Balmer
c9c6bbdea8 Bug 7356 - Fix various typos and mis-spellings
Fix typos: the the -> the, wether -> whether, developper -> developer.

http://bugs.koha-community.org/show_bug.cgi?id=7356
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:51:26 +01:00
Paul Poulain
47b7b91d14 Merge remote-tracking branch 'origin/new/bug_6716' 2012-01-13 11:46:21 +01:00
d471a79e92 6717 Documenting need_merge_authorities table
Documentation only.

http://bugs.koha-community.org/show_bug.cgi?id=6716
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-01-13 11:45:31 +01:00
Nicole C. Engard
378df7aea5 bug6716 - document the aqbooksellers table
This documents the table that stores vendor info in Koha.

There were 4 unused fields found:
  `accountnumber`
  `othersupplier`
  `currency`
  `booksellerurl`

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Accountnumber is no longer unused and can be managed.
2012-01-13 11:45:29 +01:00
Duncan Tyler
9faf50a66c Bug 7348 - Fixed error for serial toolbar buttons in IE7
http://bugs.koha-community.org/show_bug.cgi?id=7348
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:43:44 +01:00
Magnus Enger
1c04a98400 Bug 7375 - Update minimum version of Perl to 5.10
- Change the installer script to look for at least 5.10/5.010000
- Change the template to ask for the correct version

To test:
- Run through the webinstaller on 5.10 or newer and check that there are
no errors.
- Ideally: Run through the webinstaller on an older version than 5.10 and
check that there *is* an error, asking for 5.10 or newer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:42:33 +01:00
Nicole C. Engard
3340456f29 Bug 7373 - Add 5 new icons to Bridge Set
This patch adds 5 new icons to the Bridge Set.
These icons are designed by the Erikson Institute
in Chicago, IL, USA.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:39:40 +01:00
6768c72440 Bug 7368: Correct spelling of merge authorities job in pref file.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:37:46 +01:00
30dfb7d0a3 Bug 7367: Add space before display of languages.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am a bit confused why it does not work without the &nbsp;
but patch fixes the display problem.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:35:55 +01:00
Jared Camins-Esakov
c696bbec65 Bug 5226: Add 545 to es-ES and nb-NO
Since the original patches for bug 5226 were submitted, two new translations
have been added to Koha: es-ES and nb-NO. This patch adds the missing 545 line
to the frameworks for those languages.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:29:43 +01:00
442eb72be5 Bug 5226: Follow up to new/awaiting_qa/bug_5226
This patch adds the field definition to
- it-IT (default and sample frameworks)
- de-DE, en, fr-FR, pl-PL (sample frameworks)

I am not sure about the database update. If we want to do that, it should perhaps update all frameworks and languages.
At the moment only en and de-DE default frameworks are updated.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-13 11:29:39 +01:00
Jared Camins-Esakov
557836bbdc Add MARC21 field 545 to to framework fix bug 5226
Adds MARC21 field 545 to the English, French, German, and Polish MARC21
frameworks. The labels for the field still need to be translated into
French and Polish.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-13 11:29:25 +01:00
d785d9d57d Bug 6098 Followup -- doesn't replace NSB/NSE by space
On any page, NSB/NSE characters are replaced by space in Output.pm. It isn't a
good thing:

  - It isn't necessary since Zebra indexer handle properly those characters as
    delimiter.
  - It isn't necessary for display since XSL file already do that.
  - It isn't efficient since a regex is done on every whole page sent by Koha,
    not only on biblio record part.
  - It removes an information that librarian want to keep in their biblio
    records: any record edited in Koha loose its NSB/NSE characters.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 11:21:48 +01:00
Fridolyn SOMERS
1f0bad091b BUG 6098 zebra conf NSB NSE indexed as space
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-13 11:21:45 +01:00
Julian Maurice
7a3f77de8c Bug 5358: Show cancelled orders in basket page
Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-13 10:52:50 +01:00
Paul Poulain
d57da73c2f Merge remote-tracking branch 'origin/new/bug_2629' 2012-01-10 23:35:48 +01:00
Albert Oller
35bc73eca3 Bug 2629 - Diacritics not being ignored when searching
/etc/zebradb/etc/word-phrase-utf.chr
added Cc miniscule and Cc circumflex; added Kk acute accent.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
- imported marc record from the bug with the offending diacritic
- reindexed
- searched for the title - result found! Yay!
2012-01-10 23:35:32 +01:00
de5b1d8da6 Bug 5543 - Date ISO format wrong separator
This patch converts the changes in Fridolyn SOMERS patch
to T:T and adds an update to the database to correct
the description there.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-01-10 23:28:47 +01:00
Paul Poulain
37f025cf3e Bug 7278 follow-up DBrev number 2012-01-10 23:00:04 +01:00
Katrin Fischer
52098370f5 Bug 7278: Follow up fixing display of item informaton on detail page
Fixes a display problem in the item table on staff detail page.

To test:
Add a record with 3 items:
- 1 with copynumber
- 1 with materials specified
- 1 with opac notes

Before patch the table will be broken a bit and the headings
don't match the contents (wrong sequence).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-10 22:41:52 +01:00
Chris Cormack
a9e080a6fb Bug 7278 : Additional Materials
Part 2: This patch shows the message at checkout and checkin

How to test:
* Add a note in cataloguing
* Check it displays at checkout and checkin
* Check items without a note don't display anything

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
2012-01-10 22:41:50 +01:00
Chris Cormack
67c6c95396 Bug 7728 : Materials Specified field made larger and displayed
This first page makes the database change, and displays the field on
the detail.pl and moredetail.pl pages in the staff client

How to Test:

* Add a note to the materials specified page in cataloguing (952
subfield 3 for MARC21, but it shouldn't matter as long as you have a
field mapped to items.materials
* Check it displays at catalogue/detail.pl
* Check it displays at catalogue/moredetail.pl

Patch to follow to have the note display at checkin/checkout

http://bugs.koha-community.org/show_bug.cgi?id=7278

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed conflicts in updatedatabase.pl and kohastructure.sql
2012-01-10 22:41:48 +01:00
Paul Poulain
756a1f6b72 Bug 7077, follow-up
* DBrev number
* added a small text to the text displayed when upgrading (3.6 behaviour & before 3.6 behaviour)
2012-01-06 17:45:02 +01:00
bc92dda8c4 Fix for Bug 7077 - Add system pref to control behavior of submitting empty barcode field
Adds a new system preference, CircAutoPrintQuickSlip:

When an empty an empty barcode field is submitted in circulation
[ clear the screen | open a print quick slip window ].

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fixed a merge conflict with the updatedatabase.pl

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Another merge conflict resolved. Marked as Passed QA.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 17:34:10 +01:00
Srdjan Jankovic
26e9c67755 Bug 6190: BorrowerUnwantedField syspref and removing fields from the patron entry
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with example from bug and by deleting parts of it:
cardnumber|surname|firstname|title|othernames|initials|streetnumber|streettype|address|address2|city|state|zipcode|country|email|phone|mobile|fax|emailpro|phonepro|B_streetnumber|B_streettype|B_address|B_address2|B_city|B_state|B_zipcode|B_country|B_email|B_phone|dateofbirth|branchcode|categorycode|dateenrolled|dateexpiry|gonenoaddress|lost|debarred|contactname|contactfirstname|contacttitle|borrowernotes|relationship|sex|password|userid|opacnote|contactnote|sort1|sort2|altcontactfirstname|altcontactsurname|altcontactaddress1|altcontactaddress2|altcontactaddress3|altcontactstate|altcontactzipcode|altcontactcountry|altcontactphone

Note: This only affects the edit screen, not the patron detail tab.
A nice enhancement would be to make this page follow the system preference too.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
QA comments on Bugzilla. Passing QA.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
* DBrev defined
* small improvement suggested by Marcel added = there is now a link to the schema page on the systempreference
2012-01-06 17:30:25 +01:00
Adrien Saurat
74506e52de Bug 6374: default value for Size in result pages
When no size info is available, an empty string is
sent to the TT (if nothing is sent, the TT engine
will display another information, irrelevant for Koha).

Signed-off-by: Gaetan Boisson <gaetan.boisson@biblibre.com>
Works beautifully!

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 16:01:48 +01:00
9e70695907 Bug 3651 Follow-up, Require patron login to send shelves and baskets
The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
search-bar and force authentication on all OPAC pages" incorrectly
made some page permissions dependent on the value of the OpacPublic
setting. Some pages should require authentication no matter what.

This patch returns opac-sendbasket.pl to the state it was in before
Bug 4289, Bug 4274 notwithstanding. I have added the authentication
requirement to opac-sendshelf.pl to match.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) sending cart requires login
2) sending shelf requires login
3) updating personal details requires login

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:57:57 +01:00
Chris Hall
c2837b39a4 Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:53:29 +01:00
fe9312a124 Fix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity
- Adding html filter to subtitle output to correct unescaped ampersands
- Adding missing alt attributes to libravatar output
- Removing unecessary markup  from comments page

Bonus: Adding html_break filter to output of comments to preserve line breaks
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:52:30 +01:00
Duncan Tyler
0d9309e520 Fix to make date obviously editable - bug 7193
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch changes all date fields on subscription entry to be
obvious input fields. This makes it more obvious that you
can enter dates manually and is more consistent with how
we handle dates in other places.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:48:37 +01:00
Duncan Tyler
4f16da0d31 Bug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system preferences search results - bug 7341
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:17:14 +01:00
Katrin Fischer
42265ef217 Bug 7338: Follow up: show link only when there is more than 1 subscription
To be tested together with
http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690

1) Create a subscription for a title
- check the link 'Show any subscription...' doesn't show now
- check the serials collection page works correctly and shows all
necessary information

2) Create a second subscription for the same title
- check a new link 'Show any subscription...' shows up now
- use links in the issue table to change between viewing the single subscription
and the overview page
- check it works correctly and all information shows up

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

It works. With this patch, on Serials Collection page, the link, 'See any
subscription attached to this biblio' appears only when there are more than one
subscription attached to the biblio record.
2012-01-06 15:10:47 +01:00
33587674fa Bug 7338 Links on Serial Collection page
Don't display link to the serial, when the collection page displays just
one subscription. Display it when several subscriptions. Alway display a
link for displaying biblio record other subscriptions.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch works nicely, but always shows link to 'any subscriptions'.
I did a follow-up so the link would only show if there was more
than 1 subscription for the record.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:10:35 +01:00
32e1669731 Bug 7337 - "Debarred Until" display in the opac tells patrons they are debarred until the year 9999
This patch copies the debarred handling method from circulation.pl for
use on opac-user.pl so that debarred dates and comments can be handled
properly.

I have slightly reworded the message in the OPAC and on circulation.pl
to make the display of the debarred comment a little clearer.

Revision adds missing handling of debarred status with regard to
renewal operations. Renew links and buttons were not being hidden
from debarred users.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Renewal buttons are gone, message looks good.

liz@koha-deb:~/kohaclone$ prove xt
xt/permissions.t .. ok
xt/tt_valid.t ..... ok
All tests successful.
Files=2, Tests=27,  9 wallclock secs ( 0.05 usr  0.01 sys +  8.28 cusr  0.08 csys =  8.42 CPU)
Result: PASS

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 15:08:30 +01:00
Liz Rea
45cb5959ca Bug 7337 - Followup - Correcting instances of "debar" that crept back in.
To test:
Restrict one of your patrons -
Make sure that on memberentrygen.tt (Edit Patron) the radio button label says "Restricted"
Make sure that on moremember.tt (Patron detail) the button to lift debarment says "Restricted"
2012-01-06 15:08:29 +01:00
Christophe Croullebois
a0a57b9526 Bug 6147 : Correcting invalid RSS
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Feed validates using http://feed1.w3.org/ with the following recommendations:

This feed is valid, but interoperability with the widest range of feed readers could be improved by implementing the following recommendations.
line 12, column 149: Relative href value on self link: /cgi-bin/koha/opac-search.pl?idx=kw&q=some&sort_by=acqdate_dsc&format=rss2 [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 12, column 149: Self reference doesn't match document location [help]
... p;sort_by=acqdate_dsc&amp;format=rss2"/>
                                             ^
line 20, column 158: Unregistered link relationship: search (10 occurrences) [help]
... _by=&amp;format=opensearchdescription"/>
                                             ^
line 40, column 9: description should not contain relative URL references: /cgi-bin/koha/opac-reserve.pl?biblionumber=10 (10 occurrences) [help]
						]]></description>
         ^
line 22, column 5: Misplaced Item (9 occurrences) [help]
     <item>

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 14:37:37 +01:00
Paul Poulain
a60101bea0 Bug 6627 follow-up
in installer, some lines where forgotten, and can also be commented
2012-01-06 14:22:59 +01:00
Duncan Tyler
00290e8619 Bug 6627 [Signed Off] - Update to improve security in specified log files - bug 6627
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Verified sessionlog file is not written to /tmp when patch is applied. Also verified original bug - logging in did in fact log to /tmp.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 14:20:34 +01:00
Katrin Fischer
6d2ca576e2 Bug 5369: Follow up fixing quotes
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Confirm that this works. My only remark would be that &quot; could have been used.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 14:11:37 +01:00
Jared Camins-Esakov
9b3e1552c4 Bug 5369: Make series tracings use phrase indexes
By definition, series tracings should search for other records in the same
series, i.e., those with the exact same series title. This patch forces the
tracings to use phrase indexes for series tracings.

Note that this patch DOES NOT respect TraceCompleteSubfields. While that may be
desirable, it is outside the scope of the current patch. An additional follow-up
patch could be written to add support for TraceCompleteSubfields, if community
concensus is that series tracings should obey TraceCompleteSubfields.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Thx for the follow up and sign off Jared :)
2012-01-06 14:11:36 +01:00
Katrin Fischer
4cd81a8d0f Bug 5369: se queries with paranthesis fail
This patch does several things to make the search work better:

1) Adding "" around search terms for queries on index se.
2) Make links for 8xx obey the UseControlNumber system preference
3) Fix the indexing for 8xx fields, as they were not included in the se index before

Note: Make sure you copy the new record.abs into your koha-dev directory and reindex
before testing.

To test:
1) Add records using the following fields:
440$a
490$a ind. 1 = empty or 0
490$a ind. 1 = 1
800$a, 810$a, 811$a or 830$a

Example value taken form bug description, should only work after applying the patch:
DHEW publication no. (HSM) 73-1804

Please also test with other examples.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-01-06 14:11:35 +01:00
Katrin Fischer
37e1f05e8f Bug 3184: Show creator and budget on order receive page
Reimplementing 3.0.x patch from
Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>

To test:
1) Create basket
2) Order something, note your fund
3) Receive title
> Verify your name and selected fund display correctly

Additional tests:
1) Set borrowernumber in aqbasket.authorisedby to a nonexistant borrowernumber (like something really big)
> Created by should show "No name"
2) Set borrowernumber to NULL / empty
> Created by should show "No name"

Signed-off-by: Duncan Tyler <duncan@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 12:35:34 +01:00
Chris Cormack
fa1a90fd4f Bug 7394 : Fixing scoping issue with XSLT processing. Also bailing out early for 404 inestead of doing unnessecary processing
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I can confirm the bug and the solution.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Second sign-off from me, patch fixes display of detail page
for last record on a result page.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-01-06 12:29:43 +01:00
Paul Poulain
7ea4760b06 Merge remote-tracking branch 'origin/new/bug_6880'
Conflicts:
	kohaversion.pl
2012-01-06 11:03:25 +01:00
Paul Poulain
f84c19fa70 follow-up for DB rev number
I should not have used 3.6 (see mail on koha-devel)
2012-01-06 11:00:43 +01:00
Paul Poulain
2202ee78c3 Merge remote-tracking branch 'origin/new/bug_6530'
Conflicts:
	kohaversion.pl
2012-01-06 10:59:05 +01:00
Paul Poulain
f227819713 follow-up: fixing DBrev wrong number
I should not have used 3.06 (see mail on koha-devel)
2012-01-06 10:58:08 +01:00
Paul Poulain
2367475341 Merge remote-tracking branch 'origin/new/bug_6328'
Conflicts:
	kohaversion.pl
2012-01-06 10:52:47 +01:00
Paul Poulain
e0095c5585 follow-up of the previous follow-up: forgot the kohaversion.pl file 2012-01-06 10:51:42 +01:00
Paul Poulain
8fd578800e follow-up: fixing mistake in database revision number
After long discussion with chris_c (previous RM) and chris_n (previous and actual RMaint), it appears I should not have used 3.06
chris_n will duplicate this entry if it's needed to port this patch onto master.

I renumber the version to 3.07

I also have found in my testings that there is a problem if this DBrev is run twice (once in 3.6 and once in 3.8)
All patrons that are temporarily suspended (ie: have a date in debarred) will become suspended forever
The test was just made on debarred<>0, it's OK if we come from a 3.4, as debarred is a tinyint used as a boolean.
But if we already have a date, it won't do what we want.
I switched to a =1 instead of <>0, that fixes the problem
2012-01-06 10:50:48 +01:00